diff options
| author | Darkvater <darkvater@openttd.org> | 2006-04-15 20:07:42 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-04-15 20:07:42 +0000 |
| commit | d63fad7a7b7e0ff6bc6c32f119042a0317961255 (patch) | |
| tree | e8d20cb7ee880010ebaa9d3fe99190d489a7abb4 /road_cmd.c | |
| parent | f69fcf400e242d119498c0a4b99d7ec6d69d07b0 (diff) | |
| download | openttd-d63fad7a7b7e0ff6bc6c32f119042a0317961255.tar.xz | |
(svn r4435) - Fix: an assertion triggered when trying to remove a bridge with the remove-tool (r4348 surfaced this). In CmdRemoveRoad tiletype was not checked for ownership. Intorudce IsLevelCrossingTile() which checks if a tile is a crossing without knowing the type. Suggested by peter1138 and Tron.
Diffstat (limited to 'road_cmd.c')
| -rw-r--r-- | road_cmd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/road_cmd.c b/road_cmd.c index 154968421..4948bd7bc 100644 --- a/road_cmd.c +++ b/road_cmd.c @@ -47,11 +47,8 @@ static bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, bool* edge_roa // Only do the special processing for actual players. if (_current_player >= MAX_PLAYERS) return true; - if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) { - owner = GetCrossingRoadOwner(tile); - } else { - owner = GetTileOwner(tile); - } + owner = IsLevelCrossingTile(tile) ? GetCrossingRoadOwner(tile) : GetTileOwner(tile); + // Only do the special processing if the road is owned // by a town if (owner != OWNER_TOWN) { @@ -112,7 +109,7 @@ int32 CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (!IsTileType(tile, MP_STREET) && !IsTileType(tile, MP_TUNNELBRIDGE)) return CMD_ERROR; - owner = IsLevelCrossing(tile) ? GetCrossingRoadOwner(tile) : GetTileOwner(tile); + owner = IsLevelCrossingTile(tile) ? GetCrossingRoadOwner(tile) : GetTileOwner(tile); if (owner == OWNER_TOWN && _game_mode != GM_EDITOR) { if (IsTileType(tile, MP_TUNNELBRIDGE)) { // index of town is not saved for bridge (no space) |