gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town.

Browse Source
This commit is contained in:
frosch 2013-10-28 10:55:34 +00:00
parent 7480a00ce0
commit 12b30103b1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/town.h
View File

@ -161,7 +161,7 @@ enum TownRatingCheckType {
* And there are 5 more bits available on flags... * And there are 5 more bits available on flags...
*/ */
enum TownFlags { enum TownFlags {
TOWN_IS_FUNDED = 0, ///< Town has received some funds for TOWN_IS_GROWING = 0, ///< Conditions for town growth are met. Grow according to Town::growth_rate.
TOWN_HAS_CHURCH = 1, ///< There can be only one church by town. TOWN_HAS_CHURCH = 1, ///< There can be only one church by town.
TOWN_HAS_STADIUM = 2, ///< There can be only one stadium by town. TOWN_HAS_STADIUM = 2, ///< There can be only one stadium by town.
}; };

12
src/town_cmd.cpp
View File

@ -510,7 +510,7 @@ static void TileLoop_Town(TileIndex tile)
Backup<CompanyByte> cur_company(_current_company, OWNER_TOWN, FILE_LINE); Backup<CompanyByte> cur_company(_current_company, OWNER_TOWN, FILE_LINE);
if ((hs->building_flags & BUILDING_HAS_1_TILE) && if ((hs->building_flags & BUILDING_HAS_1_TILE) &&
HasBit(t->flags, TOWN_IS_FUNDED) && HasBit(t->flags, TOWN_IS_GROWING) &&
CanDeleteHouse(tile) && CanDeleteHouse(tile) &&
GetHouseAge(tile) >= hs->minimum_life && GetHouseAge(tile) >= hs->minimum_life &&
--t->time_until_rebuild == 0) { --t->time_until_rebuild == 0) {
@ -758,7 +758,7 @@ static bool GrowTown(Town *t);
static void TownTickHandler(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; int i = t->grow_counter - 1;
if (i < 0) { if (i < 0) {
if (GrowTown(t)) { if (GrowTown(t)) {
@ -2814,7 +2814,7 @@ static CommandCost TownActionFundBuildings(Town *t, DoCommandFlag flags)
/* Build next tick */ /* Build next tick */
t->grow_counter = 1; t->grow_counter = 1;
/* If we were not already growing */ /* If we were not already growing */
SetBit(t->flags, TOWN_IS_FUNDED); SetBit(t->flags, TOWN_IS_GROWING);
/* And grow for 3 months */ /* And grow for 3 months */
t->fund_buildings_months = 3; t->fund_buildings_months = 3;
@ -3012,7 +3012,7 @@ static void UpdateTownRating(Town *t)
static void UpdateTownGrowRate(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); SetWindowDirty(WC_TOWN_VIEW, t->index);
if (_settings_game.economy.town_growth_rate == 0 && t->fund_buildings_months == 0) return; 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) { 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); SetWindowDirty(WC_TOWN_VIEW, t->index);
return; return;
} }
@ -3081,7 +3081,7 @@ static void UpdateTownGrowRate(Town *t)
t->grow_counter = m; t->grow_counter = m;
} }
SetBit(t->flags, TOWN_IS_FUNDED); SetBit(t->flags, TOWN_IS_GROWING);
SetWindowDirty(WC_TOWN_VIEW, t->index); SetWindowDirty(WC_TOWN_VIEW, t->index);
} }

2
src/town_gui.cpp
View File

@ -388,7 +388,7 @@ public:
DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, string); DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, string);
} }
if (HasBit(this->town->flags, TOWN_IS_FUNDED)) { if (HasBit(this->town->flags, TOWN_IS_GROWING)) {
SetDParam(0, ((this->town->growth_rate & (~TOWN_GROW_RATE_CUSTOM)) * TOWN_GROWTH_TICKS + DAY_TICKS) / DAY_TICKS); SetDParam(0, ((this->town->growth_rate & (~TOWN_GROW_RATE_CUSTOM)) * TOWN_GROWTH_TICKS + DAY_TICKS) / DAY_TICKS);
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, this->town->fund_buildings_months == 0 ? STR_TOWN_VIEW_TOWN_GROWS_EVERY : STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED); DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, this->town->fund_buildings_months == 0 ? STR_TOWN_VIEW_TOWN_GROWS_EVERY : STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED);
} else { } else {