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

eliminate static variables and cache logic from upkeep

This commit is contained in:
Enno Rehling 2015-11-21 12:21:07 +01:00
parent 0d91a7dfde
commit 86faae6eea
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/upkeep.c
View File

@ -24,10 +24,6 @@ int lifestyle(const unit * u)
{ {
int need; int need;
plane *pl; plane *pl;
static int gamecookie = -1;
if (gamecookie != global.cookie) {
gamecookie = global.cookie;
}
if (is_monsters(u->faction)) if (is_monsters(u->faction))
return 0; return 0;
@ -116,13 +112,7 @@ void get_food(region * r)
plane *pl = rplane(r); plane *pl = rplane(r);
unit *u; unit *u;
int peasantfood = rpeasants(r) * 10; int peasantfood = rpeasants(r) * 10;
static int food_rules = -1; int food_rules = get_param_int(global.parameters, "rules.food.flags", 0);
static int gamecookie = -1;
if (food_rules < 0 || gamecookie != global.cookie) {
gamecookie = global.cookie;
food_rules = get_param_int(global.parameters, "rules.food.flags", 0);
}
if (food_rules & FOOD_IS_FREE) { if (food_rules & FOOD_IS_FREE) {
return; return;