From 12b30103b1341fc20389df4c40bd8b34b4b2be3d Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 28 Oct 2013 10:55:34 +0000 Subject: (svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town. --- src/town_cmd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/town_cmd.cpp') diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 7ab9dcdad..d431242c3 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -510,7 +510,7 @@ static void TileLoop_Town(TileIndex tile) Backup cur_company(_current_company, OWNER_TOWN, FILE_LINE); if ((hs->building_flags & BUILDING_HAS_1_TILE) && - HasBit(t->flags, TOWN_IS_FUNDED) && + HasBit(t->flags, TOWN_IS_GROWING) && CanDeleteHouse(tile) && GetHouseAge(tile) >= hs->minimum_life && --t->time_until_rebuild == 0) { @@ -758,7 +758,7 @@ static bool GrowTown(Town *t); static void TownTickHandler(Town *t) { - if (HasBit(t->flags, TOWN_IS_FUNDED)) { + if (HasBit(t->flags, TOWN_IS_GROWING)) { int i = t->grow_counter - 1; if (i < 0) { if (GrowTown(t)) { @@ -2814,7 +2814,7 @@ static CommandCost TownActionFundBuildings(Town *t, DoCommandFlag flags) /* Build next tick */ t->grow_counter = 1; /* If we were not already growing */ - SetBit(t->flags, TOWN_IS_FUNDED); + SetBit(t->flags, TOWN_IS_GROWING); /* And grow for 3 months */ t->fund_buildings_months = 3; @@ -3012,7 +3012,7 @@ static void UpdateTownRating(Town *t) static void UpdateTownGrowRate(Town *t) { - ClrBit(t->flags, TOWN_IS_FUNDED); + ClrBit(t->flags, TOWN_IS_GROWING); SetWindowDirty(WC_TOWN_VIEW, t->index); if (_settings_game.economy.town_growth_rate == 0 && t->fund_buildings_months == 0) return; @@ -3035,7 +3035,7 @@ static void UpdateTownGrowRate(Town *t) } if ((t->growth_rate & TOWN_GROW_RATE_CUSTOM) != 0) { - SetBit(t->flags, TOWN_IS_FUNDED); + SetBit(t->flags, TOWN_IS_GROWING); SetWindowDirty(WC_TOWN_VIEW, t->index); return; } @@ -3081,7 +3081,7 @@ static void UpdateTownGrowRate(Town *t) t->grow_counter = m; } - SetBit(t->flags, TOWN_IS_FUNDED); + SetBit(t->flags, TOWN_IS_GROWING); SetWindowDirty(WC_TOWN_VIEW, t->index); } -- cgit v1.2.3-54-g00ecf