diff options
| author | rubidium <rubidium@openttd.org> | 2008-07-17 20:13:01 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-07-17 20:13:01 +0000 |
| commit | d06529ef4d84ce90c90ed560a6b2f3525880c40e (patch) | |
| tree | ca5029fca4c5aee49145e4bd3e3f0f81df8ccabc /src/road_cmd.cpp | |
| parent | c2d2f817de7ec5f4afd76af2de765ac411cdf3c2 (diff) | |
| download | openttd-d06529ef4d84ce90c90ed560a6b2f3525880c40e.tar.xz | |
(svn r13719) -Codechange: rename IsValidPlayer to IsValidPlayerID in line with all other structs/classes that are in a pool.
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 28d4e76e0..4914ad1f8 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -152,7 +152,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_player == OWNER_WATER || - (rt == ROADTYPE_ROAD && !IsValidPlayer(_current_player))) return true; + (rt == ROADTYPE_ROAD && !IsValidPlayerID(_current_player))) return true; /* Only do the special processing if the road is owned * by a town */ @@ -471,7 +471,7 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* Road pieces are max 4 bitset values (NE, NW, SE, SW) and town can only be non-zero * if a non-player is building the road */ - if ((IsValidPlayer(_current_player) && p2 != 0) || (_current_player == OWNER_TOWN && !IsValidTownID(p2))) return CMD_ERROR; + if ((IsValidPlayerID(_current_player) && p2 != 0) || (_current_player == OWNER_TOWN && !IsValidTownID(p2))) return CMD_ERROR; RoadBits pieces = Extract<RoadBits, 0>(p1); |