From 57ae21a823d1cff4a1d8c18bc377b115eaa50754 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 31 Mar 2017 21:26:07 +0200 Subject: [PATCH] remove an obsolete always-true constant --- src/economy.c | 2 -- src/settings.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/economy.c b/src/economy.c index e3a6dc18d..83e4bf9d0 100644 --- a/src/economy.c +++ b/src/economy.c @@ -1242,12 +1242,10 @@ static void create_potion(unit * u, const potion_type * ptype, int want) void make_item(unit * u, const item_type * itype, int want) { if (itype->construction && fval(itype->rtype, RTF_LIMITED)) { -#if GUARD_DISABLES_PRODUCTION == 1 if (is_guarded(u->region, u)) { cmistake(u, u->thisorder, 70, MSG_EVENT); return; } -#endif allocate_resource(u, itype->rtype, want); } else { diff --git a/src/settings.h b/src/settings.h index e7ec39305..86d5a5571 100644 --- a/src/settings.h +++ b/src/settings.h @@ -13,7 +13,6 @@ #define ENTERTAINFRACTION 20 #define TEACHDIFFERENCE 2 #define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define COMBAT_TURNS 5