diff options
| author | smatz <smatz@openttd.org> | 2009-05-17 01:00:56 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-17 01:00:56 +0000 |
| commit | 871107f52952ee59c353feab933126ed206e60bf (patch) | |
| tree | 482884dfedc1700bddb8812f1de755212ed8bb22 /src/road_cmd.cpp | |
| parent | ed1e54bd84074412ea9f273b7cd86aed42d844ce (diff) | |
| download | openttd-871107f52952ee59c353feab933126ed206e60bf.tar.xz | |
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 4590111e2..356d1696e 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -119,7 +119,7 @@ bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, RoadType * Towns are not be allowed to remove non "normal" road pieces, like tram * tracks as that would result in trams that cannot turn. */ if (_current_company == OWNER_WATER || - (rt == ROADTYPE_ROAD && !IsValidCompanyID(_current_company))) return true; + (rt == ROADTYPE_ROAD && !Company::IsValidID(_current_company))) return true; /* Only do the special processing if the road is owned * by a town */ @@ -455,7 +455,7 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 /* Road pieces are max 4 bitset values (NE, NW, SE, SW) and town can only be non-zero * if a non-company is building the road */ - if ((IsValidCompanyID(_current_company) && p2 != 0) || (_current_company == OWNER_TOWN && !IsValidTownID(p2))) return CMD_ERROR; + if ((Company::IsValidID(_current_company) && p2 != 0) || (_current_company == OWNER_TOWN && !Town::IsValidID(p2))) return CMD_ERROR; if (_current_company != OWNER_TOWN) { const Town *town = CalcClosestTownFromTile(tile); p2 = (town != NULL) ? town->index : (TownID)INVALID_TOWN; |