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

remove an obsolete always-true constant

This commit is contained in:
Enno Rehling 2017-03-31 21:26:07 +02:00
parent 37f3c02ceb
commit 57ae21a823
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.c
View File

@ -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) void make_item(unit * u, const item_type * itype, int want)
{ {
if (itype->construction && fval(itype->rtype, RTF_LIMITED)) { if (itype->construction && fval(itype->rtype, RTF_LIMITED)) {
#if GUARD_DISABLES_PRODUCTION == 1
if (is_guarded(u->region, u)) { if (is_guarded(u->region, u)) {
cmistake(u, u->thisorder, 70, MSG_EVENT); cmistake(u, u->thisorder, 70, MSG_EVENT);
return; return;
} }
#endif
allocate_resource(u, itype->rtype, want); allocate_resource(u, itype->rtype, want);
} }
else { else {

1
src/settings.h
View File

@ -13,7 +13,6 @@
#define ENTERTAINFRACTION 20 #define ENTERTAINFRACTION 20
#define TEACHDIFFERENCE 2 #define TEACHDIFFERENCE 2
#define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5 #define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5 #define COMBAT_TURNS 5