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

Merge branch 'master' of https://github.com/eressea/server

This commit is contained in:
Enno Rehling 2014-08-06 23:48:24 +02:00
parent 7348ce698b b90b744287
commit 6889f186a9
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/economy.c
View File

@ -96,7 +96,6 @@ static int norders;
static request *oa; static request *oa;
#define RECRUIT_MERGE 1 #define RECRUIT_MERGE 1
#define RECRUIT_CLASSIC 2
static int rules_recruit = -1; static int rules_recruit = -1;
static void recruit_init(void) static void recruit_init(void)
@ -106,9 +105,6 @@ static void recruit_init(void)
if (get_param_int(global.parameters, "recruit.allow_merge", 1)) { if (get_param_int(global.parameters, "recruit.allow_merge", 1)) {
rules_recruit |= RECRUIT_MERGE; rules_recruit |= RECRUIT_MERGE;
} }
if (get_param_int(global.parameters, "recruit.classic", 1)) {
rules_recruit |= RECRUIT_CLASSIC;
}
} }
} }
@ -1188,9 +1184,7 @@ void economics(region * r)
if ((rules_recruit & RECRUIT_MERGE) || u->number == 0) { if ((rules_recruit & RECRUIT_MERGE) || u->number == 0) {
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (getkeyword(ord) == K_RECRUIT) { if (getkeyword(ord) == K_RECRUIT) {
if (rules_recruit & RECRUIT_CLASSIC) {
recruit(u, ord, &recruitorders); recruit(u, ord, &recruitorders);
}
break; break;
} }
} }