From 5b47f81b0f6d46a876a24c0384791af123ac4ab7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 5 Apr 2008 23:36:54 +0000 Subject: (svn r12584) -Codechange: do not access the order type directly. --- src/yapf/yapf_destrail.hpp | 2 +- src/yapf/yapf_road.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/yapf') diff --git a/src/yapf/yapf_destrail.hpp b/src/yapf/yapf_destrail.hpp index 7f03f8cec..16a0ea38a 100644 --- a/src/yapf/yapf_destrail.hpp +++ b/src/yapf/yapf_destrail.hpp @@ -86,7 +86,7 @@ protected: public: void SetDestination(Vehicle* v) { - switch (v->current_order.type) { + switch (v->current_order.GetType()) { case OT_GOTO_STATION: m_destTile = CalcStationCenterTile(v->current_order.dest); m_dest_station_id = v->current_order.dest; diff --git a/src/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp index eef92e5f7..efa6bb70d 100644 --- a/src/yapf/yapf_road.cpp +++ b/src/yapf/yapf_road.cpp @@ -84,7 +84,7 @@ public: const Vehicle* v = Yapf().GetVehicle(); // we have reached the vehicle's destination - segment should end here to avoid target skipping - if (v->current_order.type == OT_GOTO_STATION && tile == v->dest_tile) break; + if (v->current_order.IsType(OT_GOTO_STATION) && tile == v->dest_tile) break; // stop if we have just entered the depot if (IsTileDepotType(tile, TRANSPORT_ROAD) && trackdir == DiagdirToDiagTrackdir(ReverseDiagDir(GetRoadDepotDirection(tile)))) { -- cgit v1.2.3-70-g09d2