diff options
author | belugas <belugas@openttd.org> | 2007-08-23 18:05:51 +0000 |
---|---|---|
committer | belugas <belugas@openttd.org> | 2007-08-23 18:05:51 +0000 |
commit | a079834cfc0837c84d36d53bf4ce2a1e204758d2 (patch) | |
tree | 89352c710ffff889b808000952c415c0a298bc4c | |
parent | da8d778622be5c98b1d2fa8f938d47824d13c153 (diff) | |
download | openttd-a079834cfc0837c84d36d53bf4ce2a1e204758d2.tar.xz |
(svn r10968) -Codechange: Remove a tileloop performed in the AfterLoadCountBuildings function and use the main loop of CheckhouseIDs instead
-rw-r--r-- | src/newgrf_house.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index bbc7c19c8..b66d1be38 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -33,6 +33,8 @@ HouseOverrideManager _house_mngr(NEW_HOUSE_OFFSET, HOUSE_MAX, INVALID_HOUSE_ID); void CheckHouseIDs() { + InitializeBuildingCounts(); + for (TileIndex t = 0; t < MapSize(); t++) { HouseID house_id; @@ -42,13 +44,11 @@ void CheckHouseIDs() if (!GetHouseSpecs(house_id)->enabled && house_id >= NEW_HOUSE_OFFSET) { /* The specs for this type of house are not available any more, so * replace it with the substitute original house type. */ - SetHouseType(t, _house_mngr.GetSubstituteID(house_id)); + house_id = _house_mngr.GetSubstituteID(house_id); + SetHouseType(t, house_id); } + IncreaseBuildingCount(GetTownByTile(t), house_id); } - - InitializeBuildingCounts(); - AfterLoadCountBuildings(); - } HouseClassID AllocateHouseClassID(byte grf_class_id, uint32 grfid) |