From b90b744287f1d155cddd2bbb5993ee1c34a1b06e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 4 Aug 2014 19:53:16 +0200 Subject: [PATCH] removing unused RECRUIT_CLASSIC option. Dead code is dead. --- src/economy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/economy.c b/src/economy.c index 2f58fc8e2..3a981256c 100644 --- a/src/economy.c +++ b/src/economy.c @@ -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; } } }