cpp/openttd-patchpack/source Changeset - r11288:5c4e64d574de

Changeset - r11288:5c4e64d574de

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

smatz - 15 years ago 2009-03-08 01:20:11
smatz@openttd.org

(svn r15642) -Codechange: use a default parameter value in CalcClosestTownFromTile

4 files changed with 9 insertions and 9 deletions:

src/road_cmd.cpp

src/saveload/afterload.cpp

src/town.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -290,7 +290,7 @@ static CommandCost RemoveRoad(TileIndex @@
 					} else {
 						if (rt == ROADTYPE_ROAD && IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_TOWN)) {
 							/* Update nearest-town index */
-							const Town *town = CalcClosestTownFromTile(tile, UINT_MAX);
 							const Town *town = CalcClosestTownFromTile(tile);
 							SetTownIndex(tile, town == NULL ? (TownID)INVALID_TOWN : town->index);
+						}
 						SetRoadBits(tile, ROAD_NONE, rt);
@@ @@ -457,7 +457,7 @@ CommandCost CmdBuildRoad(TileIndex tile, @@
 	 * if a non-company is building the road */
 	if ((IsValidCompanyID(_current_company) && p2 != 0) || (_current_company == OWNER_TOWN && !IsValidTownID(p2))) return CMD_ERROR;
 	if (_current_company != OWNER_TOWN) {
-		const Town *town = CalcClosestTownFromTile(tile, UINT_MAX);
 		const Town *town = CalcClosestTownFromTile(tile);
 		p2 = (town != NULL) ? town->index : (TownID)INVALID_TOWN;
+	}
@@ @@ -1254,7 +1254,7 @@ void UpdateNearestTownForRoadTiles(bool @@
 		if (IsTileType(t, MP_ROAD) && !HasTownOwnedRoad(t)) {
 			TownID tid = (TownID)INVALID_TOWN;
 			if (!invalidate) {
-				const Town *town = CalcClosestTownFromTile(t, UINT_MAX);
 				const Town *town = CalcClosestTownFromTile(t);
 				if (town != NULL) tid = town->index;
+			}
 			SetTownIndex(t, tid);

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -624,13 +624,13 @@ bool AfterLoadGame() @@
 			switch (GetTileType(t)) {
 				case MP_HOUSE:
 					_m[t].m4 = _m[t].m2;
-					SetTownIndex(t, CalcClosestTownFromTile(t, UINT_MAX)->index);
 					SetTownIndex(t, CalcClosestTownFromTile(t)->index);
 					break;
 				case MP_ROAD:
 					_m[t].m4 |= (_m[t].m2 << 4);
 					if ((GB(_m[t].m5, 4, 2) == ROAD_TILE_CROSSING ? (Owner)_m[t].m3 : GetTileOwner(t)) == OWNER_TOWN) {
-						SetTownIndex(t, CalcClosestTownFromTile(t, UINT_MAX)->index);
 						SetTownIndex(t, CalcClosestTownFromTile(t)->index);
 					} else {
 						SetTownIndex(t, 0);
+					}
@@ @@ -775,7 +775,7 @@ bool AfterLoadGame() @@
 							break;
+					}
 					if (!HasTownOwnedRoad(t)) {
-						const Town *town = CalcClosestTownFromTile(t, (uint)-1);
 						const Town *town = CalcClosestTownFromTile(t);
 						if (town != NULL) SetTownIndex(t, town->index);
+					}
 					_m[t].m4 = 0;
@@ @@ -1273,7 +1273,7 @@ bool AfterLoadGame() @@
 	if (CheckSavegameVersion(52)) {
 		for (TileIndex t = 0; t < map_size; t++) {
 			if (IsStatueTile(t)) {
-				_m[t].m2 = CalcClosestTownFromTile(t, UINT_MAX)->index;
 				_m[t].m2 = CalcClosestTownFromTile(t)->index;
+			}
+		}
+	}

src/town.h

➞

Show inline comments

@@ @@ -340,7 +340,7 @@ static inline Town *GetRandomTown() @@
 	return GetTown(index);
+}
 Town *CalcClosestTownFromTile(TileIndex tile, uint threshold);
+Town *CalcClosestTownFromTile(TileIndex tile, uint threshold = UINT_MAX);
 #define FOR_ALL_TOWNS_FROM(t, start) for (t = GetTown(start); t != NULL; t = (t->index + 1U < GetTownPoolSize()) ? GetTown(t->index + 1U) : NULL) if (t->IsValid())
 #define FOR_ALL_TOWNS(t) FOR_ALL_TOWNS_FROM(t, 0)

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -2590,7 +2590,7 @@ Town *ClosestTownFromTile(TileIndex tile @@
 				Town *town = GetTown(tid);
 				assert(town->IsValid());
-				assert(town == CalcClosestTownFromTile(tile, UINT_MAX));
 				assert(town == CalcClosestTownFromTile(tile));
 				if (DistanceManhattan(tile, town->xy) >= threshold) town = NULL;

0 comments (0 inline, 0 general)