forked from github/server
Merge branch 'master' of https://github.com/eressea/server
This commit is contained in:
commit
6889f186a9
|
@ -96,7 +96,6 @@ static int norders;
|
|||
static request *oa;
|
||||
|
||||
#define RECRUIT_MERGE 1
|
||||
#define RECRUIT_CLASSIC 2
|
||||
static int rules_recruit = -1;
|
||||
|
||||
static void recruit_init(void)
|
||||
|
@ -106,9 +105,6 @@ static void recruit_init(void)
|
|||
if (get_param_int(global.parameters, "recruit.allow_merge", 1)) {
|
||||
rules_recruit |= RECRUIT_MERGE;
|
||||
}
|
||||
if (get_param_int(global.parameters, "recruit.classic", 1)) {
|
||||
rules_recruit |= RECRUIT_CLASSIC;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1188,10 +1184,8 @@ void economics(region * r)
|
|||
if ((rules_recruit & RECRUIT_MERGE) || u->number == 0) {
|
||||
for (ord = u->orders; ord; ord = ord->next) {
|
||||
if (getkeyword(ord) == K_RECRUIT) {
|
||||
if (rules_recruit & RECRUIT_CLASSIC) {
|
||||
recruit(u, ord, &recruitorders);
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue