miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging town-potential

Browse Source 
--HG--
branch : novattd-v14
This commit is contained in:
Pavel Stupnikov
2014-04-02 01:41:54 +04:00
parent d257170932 df7a1a5feb
commit 1c71c8df7d
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/english.txt
View File

@@ -5043,8 +5043,8 @@ STR_TOWN_DIRECTORY_TOWN_COLOUR :{TOWN}{BLACK} (
STR_OLD_DEPOT_TRAINT_LENGTH :Old depot length format: {STRING2}
STR_TOWN_DIRECTORY_CAPTION_EXTRA :{WHITE}Towns ({YELLOW}{COMMA}{WHITE} / {ORANGE}{COMMA}{WHITE})
STR_SMALLMAP_TOWN_LARGE :{TINY_FONT}{YELLOW}{TOWN}
STR_TOWN_VIEW_TOWN_CAPTION_EXTRA :{WHITE}{TOWN} [{COMMA}]
STR_TOWN_VIEW_CITY_CAPTION_EXTRA :{WHITE}{TOWN} (City) [{COMMA}]
STR_TOWN_VIEW_TOWN_CAPTION_EXTRA :{WHITE}{TOWN} {COMMA} [{COMMA}]
STR_TOWN_VIEW_CITY_CAPTION_EXTRA :{WHITE}{TOWN} (City) {COMMA} [{COMMA}]
STR_ORDER_DIST :{NUM}, {NUM}

2
src/saveload/town_sl.cpp
View File

@@ -30,6 +30,7 @@ void RebuildTownCaches()
FOR_ALL_TOWNS(town) {
town->cache.population = 0;
town->cache.num_houses = 0;
town->cache.potential_pop = 0;
}
for (TileIndex t = 0; t < MapSize(); t++) {
@@ -39,6 +40,7 @@ void RebuildTownCaches()
town = Town::GetByTile(t);
IncreaseBuildingCount(town, house_id);
if (IsHouseCompleted(t)) town->cache.population += HouseSpec::Get(house_id)->population;
town->cache.potential_pop += HouseSpec::Get(house_id)->population;
/* Increase the number of houses for every house, but only once. */
if (GetHouseNorthPart(house_id) == 0) town->cache.num_houses++;

1
src/town.h
View File

@@ -49,6 +49,7 @@ extern TownPool _town_pool;
struct TownCache {
uint32 num_houses; ///< Amount of houses
uint32 population; ///< Current population of people
uint32 potential_pop; ///< Potential population (if all houses are finished)
ViewportSign sign; ///< Location of name sign, UpdateVirtCoord updates this
PartOfSubsidyByte part_of_subsidy; ///< Is this town a source/destination of a subsidy?
uint32 squared_town_zone_radius[HZB_END]; ///< UpdateTownRadius updates this given the house count

2
src/town_cmd.cpp
View File

@@ -2487,6 +2487,7 @@ static bool BuildTownHouse(Town *t, TileIndex tile)
/* build the house */
t->cache.num_houses++;
t->cache.potential_pop += hs->population;
/* Special houses that there can be only one of. */
t->flags |= oneof;
@@ -2578,6 +2579,7 @@ void ClearTownHouse(Town *t, TileIndex tile)
}
t->cache.num_houses--;
t->cache.potential_pop -= hs->population;
/* Clear flags for houses that only may exist once/town. */
if (hs->building_flags & BUILDING_IS_CHURCH) {

3
src/town_gui.cpp
View File

@@ -354,7 +354,8 @@ public:
{
if (widget == WID_TV_CAPTION){
SetDParam(0, this->town->index);
SetDParam(1, this->town->ratings[_current_company]);
SetDParam(1, this->town->cache.potential_pop);
SetDParam(2, this->town->ratings[_current_company]);
}
if (widget == WID_TV_CB){
extern bool _novahost;