mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9745) -Codechange [YAPF}: if destination is a waypoint then YAPF gets destination tile from that waypoint->xy instead of from v->dest_tile

release/0.6
KUDr 2007-04-29 09:55:32 +00:00
parent 469c04478a
commit 027597f485
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/yapf/yapf_destrail.hpp
View File

@ -86,14 +86,27 @@ protected:
public: public:
void SetDestination(Vehicle* v) void SetDestination(Vehicle* v)
{ {
if (v->current_order.type == OT_GOTO_STATION) { switch (v->current_order.type) {
m_destTile = CalcStationCenterTile(v->current_order.dest); case OT_GOTO_STATION:
m_dest_station_id = v->current_order.dest; m_destTile = CalcStationCenterTile(v->current_order.dest);
m_destTrackdirs = INVALID_TRACKDIR_BIT; m_dest_station_id = v->current_order.dest;
} else { m_destTrackdirs = INVALID_TRACKDIR_BIT;
m_destTile = v->dest_tile; break;
m_dest_station_id = INVALID_STATION;
m_destTrackdirs = (TrackdirBits)(GetTileTrackStatus(v->dest_tile, TRANSPORT_RAIL) & TRACKDIR_BIT_MASK); case OT_GOTO_WAYPOINT: {
Waypoint *wp = GetWaypoint(v->current_order.dest);
if (wp == NULL) break;
m_destTile = wp->xy;
m_dest_station_id = INVALID_STATION;
m_destTrackdirs = TrackToTrackdirBits(AxisToTrack(GetWaypointAxis(wp->xy)));
break;
}
default:
m_destTile = v->dest_tile;
m_dest_station_id = INVALID_STATION;
m_destTrackdirs = (TrackdirBits)(GetTileTrackStatus(v->dest_tile, TRANSPORT_RAIL) & TRACKDIR_BIT_MASK);
break;
} }
CYapfDestinationRailBase::SetDestination(v); CYapfDestinationRailBase::SetDestination(v);
} }