gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18924) -Fix [NoAI]: AIOrder::GetOrderDestination could return a non-waypoint tile when the waypoint was a multitile waypoint

Browse Source
This commit is contained in:
yexo 2010-01-27 12:45:41 +00:00
parent cd6eac77c3
commit 849e676410
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ai/api/ai_order.cpp
View File

@ -188,8 +188,7 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
case OT_GOTO_STATION: { case OT_GOTO_STATION: {
const Station *st = ::Station::Get(order->GetDestination()); const Station *st = ::Station::Get(order->GetDestination());
if (st->train_station.tile != INVALID_TILE) { if (st->train_station.tile != INVALID_TILE) {
for (uint i = 0; i < st->train_station.w; i++) { TILE_AREA_LOOP(t, st->train_station) {
TileIndex t = st->train_station.tile + TileDiffXY(i, 0);
if (st->TileBelongsToRailStation(t)) return t; if (st->TileBelongsToRailStation(t)) return t;
} }
} else if (st->dock_tile != INVALID_TILE) { } else if (st->dock_tile != INVALID_TILE) {
@ -206,7 +205,16 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
} }
return INVALID_TILE; return INVALID_TILE;
} }
case OT_GOTO_WAYPOINT: return ::Waypoint::Get(order->GetDestination())->xy;
case OT_GOTO_WAYPOINT: {
const Waypoint *wp = ::Waypoint::Get(order->GetDestination());
if (wp->train_station.tile != INVALID_TILE) {
TILE_AREA_LOOP(t, wp->train_station) {
if (wp->TileBelongsToRailStation(t)) return t;
}
}
return INVALID_TILE;
}
default: return INVALID_TILE; default: return INVALID_TILE;
} }
} }