diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-23 12:02:09 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-23 12:02:09 +0000 |
| commit | 16ad8df17555e4745b1c77d08d3d3e489a2d8e68 (patch) | |
| tree | 1ebb60b62a40235b163aad7e729c33ea1138136f /src | |
| parent | fefc8809719a50e35143215d017400f26759eee9 (diff) | |
| download | openttd-16ad8df17555e4745b1c77d08d3d3e489a2d8e68.tar.xz | |
(svn r16925) -Fix (r16909): guard commands more against using waypoints as stations and/or accidentally reusing waypoints for stations or vice versa.
Diffstat (limited to 'src')
| -rw-r--r-- | src/station_cmd.cpp | 14 | ||||
| -rw-r--r-- | src/waypoint_cmd.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b3724e241..9c54cbac6 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -81,7 +81,7 @@ static Station *GetStationAround(TileIndex tile, int w, int h, StationID closest StationID t = GetStationIndex(tile_cur); if (closest_station == INVALID_STATION) { - closest_station = t; + if (Station::IsValidID(closest_station)) closest_station = t; } else if (closest_station != t) { _error_message = STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING; return CHECK_STATIONS_ERR; @@ -898,8 +898,8 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin } else { /* Extend the current station, and don't check whether it will * be near any other stations. */ - st = Station::Get(est); - check_surrounding = false; + st = Station::GetIfValid(est); + check_surrounding = (st == NULL); } } else { /* There's no station here. Don't check the tiles surrounding this @@ -915,7 +915,7 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin } /* Distant join */ - if (st == NULL && distant_join) st = Station::Get(station_to_join); + if (st == NULL && distant_join) st = Station::GetIfValid(station_to_join); /* See if there is a deleted station close to us. */ if (st == NULL && reuse) st = GetClosestDeletedStation(tile_org); @@ -1435,7 +1435,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin } /* Distant join */ - if (st == NULL && distant_join) st = Station::Get(station_to_join); + if (st == NULL && distant_join) st = Station::GetIfValid(station_to_join); /* Find a deleted station close to us */ if (st == NULL && reuse) st = GetClosestDeletedStation(tile); @@ -1795,7 +1795,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint } /* Distant join */ - if (st == NULL && distant_join) st = Station::Get(station_to_join); + if (st == NULL && distant_join) st = Station::GetIfValid(station_to_join); /* Find a deleted station close to us */ if (st == NULL && reuse) st = GetClosestDeletedStation(tile); @@ -2031,7 +2031,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } /* Distant join */ - if (st == NULL && distant_join) st = Station::Get(station_to_join); + if (st == NULL && distant_join) st = Station::GetIfValid(station_to_join); /* Find a deleted station close to us */ if (st == NULL && reuse) st = GetClosestDeletedStation(tile); diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index 9d5fe88a6..7891d7aac 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -60,7 +60,7 @@ void MakeDefaultWaypointName(Waypoint *wp) WaypointID cid = 0; // current index, goes to Waypoint::GetPoolSize()-1, then wraps to 0 do { - Waypoint *lwp = Waypoint::Get(cid); + Waypoint *lwp = Waypoint::GetIfValid(cid); /* check only valid waypoints... */ if (lwp != NULL && wp != lwp) { |