dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12698) -Codechange: skip orders to stations that do not have a train part anymore, just like is done for road vehicles and ships.

Browse Source
This commit is contained in:
rubidium
2008-04-14 07:08:43 +00:00
parent 60102c9d73
commit 760a57867f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ship_cmd.cpp
View File

@@ -243,7 +243,7 @@ TileIndex Ship::GetOrderStationLocation(StationID station)
{ {
if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION; if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
Station *st = GetStation(station); const Station *st = GetStation(station);
if (st->dock_tile != 0) { if (st->dock_tile != 0) {
return TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile))); return TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile)));
} else { } else {

9
src/train_cmd.cpp
View File

@@ -2563,7 +2563,14 @@ TileIndex Train::GetOrderStationLocation(StationID station)
{ {
if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION; if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
return GetStation(station)->xy; const Station *st = GetStation(station);
if (!(st->facilities & FACIL_TRAIN)) {
/* The destination station has no trainstation tiles. */
this->cur_order_index++;
return 0;
}
return st->xy;
} }
void Train::MarkDirty() void Train::MarkDirty()