diff options
| author | Joan Josep <juanjo.ng.83@gmail.com> | 2019-01-13 00:20:10 +0100 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2019-01-12 23:20:10 +0000 |
| commit | 9aecbac2b4a4137abc44ff12a672916ec7482047 (patch) | |
| tree | 90c5399832b5122a63f6eaef6506d92e1299de2b /src/road_cmd.cpp | |
| parent | 96854b2b8bea85926113326e1fd37ee357f7e59e (diff) | |
| download | openttd-9aecbac2b4a4137abc44ff12a672916ec7482047.tar.xz | |
Codechange: Define INVALID_TOWN as a TownID (#7044)
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index bdc8ce7f3..175e776e5 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -333,7 +333,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec if (rt == ROADTYPE_ROAD && IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_TOWN)) { /* Update nearest-town index */ const Town *town = CalcClosestTownFromTile(tile); - SetTownIndex(tile, town == NULL ? (TownID)INVALID_TOWN : town->index); + SetTownIndex(tile, town == NULL ? INVALID_TOWN : town->index); } SetRoadBits(tile, ROAD_NONE, rt); SetRoadTypes(tile, rts); @@ -494,7 +494,7 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 if ((Company::IsValidID(company) && p2 != 0) || (company == OWNER_TOWN && !Town::IsValidID(p2)) || (company == OWNER_DEITY && p2 != 0)) return CMD_ERROR; if (company != OWNER_TOWN) { const Town *town = CalcClosestTownFromTile(tile); - p2 = (town != NULL) ? town->index : (TownID)INVALID_TOWN; + p2 = (town != NULL) ? town->index : INVALID_TOWN; if (company == OWNER_DEITY) { company = OWNER_TOWN; @@ -1444,7 +1444,7 @@ void UpdateNearestTownForRoadTiles(bool invalidate) for (TileIndex t = 0; t < MapSize(); t++) { if (IsTileType(t, MP_ROAD) && !IsRoadDepot(t) && !HasTownOwnedRoad(t)) { - TownID tid = (TownID)INVALID_TOWN; + TownID tid = INVALID_TOWN; if (!invalidate) { const Town *town = CalcClosestTownFromTile(t); if (town != NULL) tid = town->index; |