From 62a7948af0ca9eb3b190a54918201e1075edcbbc Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 22 May 2009 15:13:50 +0000 Subject: (svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved --- src/road_cmd.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/road_cmd.cpp') diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 356d1696e..30b606bc3 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1243,11 +1243,13 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt) } } -/** Updates cached nearest town for all road tiles +/** + * Updates cached nearest town for all road tiles * @param invalidate are we just invalidating cached data? + * @param ignore town that should be ignored (because we are deleting it now) * @pre invalidate == true implies _generating_world == true */ -void UpdateNearestTownForRoadTiles(bool invalidate) +void UpdateNearestTownForRoadTiles(bool invalidate, const Town *ignore) { assert(!invalidate || _generating_world); @@ -1255,7 +1257,7 @@ void UpdateNearestTownForRoadTiles(bool invalidate) if (IsTileType(t, MP_ROAD) && !HasTownOwnedRoad(t)) { TownID tid = (TownID)INVALID_TOWN; if (!invalidate) { - const Town *town = CalcClosestTownFromTile(t); + const Town *town = CalcClosestTownFromTile(t, UINT_MAX, ignore); if (town != NULL) tid = town->index; } SetTownIndex(t, tid); -- cgit v1.2.3-54-g00ecf