Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- K_GM can be disabled 

http://bugs.eressea.de/view.php?id=1470
"mit Katapulten kann man nicht bewachen"
fixed siege_weapons parameter
Issue: 1470
This commit is contained in:
Enno Rehling 2008-08-28 11:45:49 +00:00
parent bd322436ab
commit 854135b934
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/gamecode/laws.c
View File

@ -3803,11 +3803,15 @@ init_processor(void)
}
#if INFOCMD_MODULE
add_proc_global(p, &infocommands, NULL);
if (!global.disabled[K_INFO]) {
add_proc_global(p, &infocommands, NULL);
}
#endif
add_proc_global(p, &gmcommands, "GM Kommandos");
if (!global.disabled[K_GM]) {
add_proc_global(p, &gmcommands, "GM Kommandos");
}
p += 10; /* in case it has any effects on allincevictories */
p += 10; /* in case it has any effects on alliance victories */
add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen");
if (!nobattle) {

2
src/common/kernel/battle.c
View File

@ -211,7 +211,7 @@ armedmen(const unit * u, boolean siege_weapons)
* Personen minimiert */
for (itm=u->items;itm;itm=itm->next) {
const weapon_type * wtype = resource2weapon(itm->type->rtype);
if (wtype==NULL || (wtype->flags & WTF_SIEGE)) continue;
if (wtype==NULL || (!siege_weapons && (wtype->flags & WTF_SIEGE))) continue;
if (effskill(u, wtype->skill) >= 1) n += itm->number;
/* if (effskill(u, wtype->skill) >= wtype->minskill) n += itm->number; */
if (n>u->number) break;