Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14482) -Codechange: Use a class for saving the current train order when extending the reserved path beyond the current destination during pathfinding.

Browse Source 
The class' destructor will make sure that the order is restored on function exit in all cases.
This commit is contained in:
michi_cc 2008-10-18 13:13:27 +00:00
parent 0b8000815b
commit 9a7270d147
1 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/train_cmd.cpp
View File

@ -2809,36 +2809,54 @@ static bool TryReserveSafeTrack(const Vehicle* v, TileIndex tile, Trackdir td, b
} }
} }
/** /** This class will save the current order of a vehicle and restore it on destruction. */
* Query the next order after a certain order index. class VehicleOrderSaver
*
* @param v The vehicle
* @param order_index [in/out] Index of the current order, returns index of the chosen order
* @return Pointer to the order or NULL if the order chain was completely followed
* without finding a suitable order.
*/
static const Order* GetNextTrainOrder(const Vehicle *v, VehicleOrderID *order_index)
{ {
++(*order_index); private:
Vehicle *v;
Order old_order;
TileIndex old_dest_tile;
VehicleOrderID index;
public:
VehicleOrderSaver(Vehicle *_v) : v(_v), old_order(_v->current_order), old_dest_tile(_v->dest_tile), index(_v->cur_order_index)
{
}
~VehicleOrderSaver()
{
this->v->current_order = this->old_order;
this->v->dest_tile = this->old_dest_tile;
}
/**
* Set the current vehicle order to the next order in the order list.
* @return True if a suitable next order could be found.
*/
bool SwitchToNextOrder()
{
++this->index;
do { do {
/* Wrap around. */ /* Wrap around. */
if (*order_index >= v->num_orders) *order_index = 0; if (this->index >= this->v->num_orders) this->index = 0;
Order *order = GetVehicleOrder(v, *order_index); Order *order = GetVehicleOrder(this->v, this->index);
assert(order != NULL); assert(order != NULL);
switch (order->GetType()) { switch (order->GetType()) {
case OT_GOTO_DEPOT: case OT_GOTO_DEPOT:
/* Skip service in depot orders when the train doesn't need service. */ /* Skip service in depot orders when the train doesn't need service. */
if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) break; if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !this->v->NeedsServicing()) break;
case OT_GOTO_STATION: case OT_GOTO_STATION:
case OT_GOTO_WAYPOINT: case OT_GOTO_WAYPOINT:
return order; this->v->current_order = *order;
UpdateOrderDest(this->v, order);
return true;
case OT_CONDITIONAL: { case OT_CONDITIONAL: {
VehicleOrderID next = ProcessConditionalOrder(order, v); VehicleOrderID next = ProcessConditionalOrder(order, this->v);
if (next != INVALID_VEH_ORDER_ID) { if (next != INVALID_VEH_ORDER_ID) {
*order_index = next; this->index = next;
continue; continue;
} }
break; break;
@ -2846,12 +2864,11 @@ static const Order* GetNextTrainOrder(const Vehicle *v, VehicleOrderID *order_in
default: default:
break; break;
} }
} while (++this->index != this->v->cur_order_index);
++(*order_index); return false;
} while (*order_index != v->cur_order_index);
return NULL;
} }
};
/* choose a track */ /* choose a track */
static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool force_res, bool *got_reservation, bool mark_stuck) static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool force_res, bool *got_reservation, bool mark_stuck)
@ -2964,10 +2981,9 @@ static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir
if (got_reservation != NULL) *got_reservation = true; if (got_reservation != NULL) *got_reservation = true;
/* Save the current train order. The destructor will restore the old order on function exit. */
VehicleOrderSaver orders(v);
/* Reservation target found and free, check if it is safe. */ /* Reservation target found and free, check if it is safe. */
Order cur_order = v->current_order;
TileIndex cur_dest_tile = v->dest_tile;
VehicleOrderID order_index = v->cur_order_index;
while (!IsSafeWaitingPosition(v, res_dest.tile, res_dest.trackdir, true, _settings_game.pf.forbid_90_deg)) { while (!IsSafeWaitingPosition(v, res_dest.tile, res_dest.trackdir, true, _settings_game.pf.forbid_90_deg)) {
/* Extend reservation until we have found a safe position. */ /* Extend reservation until we have found a safe position. */
DiagDirection exitdir = TrackdirToExitdir(res_dest.trackdir); DiagDirection exitdir = TrackdirToExitdir(res_dest.trackdir);
@ -2978,10 +2994,7 @@ static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir
} }
/* Get next order with destination. */ /* Get next order with destination. */
const Order *order = GetNextTrainOrder(v, &order_index); if (orders.SwitchToNextOrder()) {
if (order != NULL) {
v->current_order = *order;
UpdateOrderDest(v, order);
PBSTileInfo cur_dest; PBSTileInfo cur_dest;
DoTrainPathfind(v, next_tile, exitdir, reachable, NULL, true, &cur_dest); DoTrainPathfind(v, next_tile, exitdir, reachable, NULL, true, &cur_dest);
if (cur_dest.tile != INVALID_TILE) { if (cur_dest.tile != INVALID_TILE) {
@ -3004,8 +3017,6 @@ static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir
} }
break; break;
} }
v->current_order = cur_order;
v->dest_tile = cur_dest_tile;
TryReserveRailTrack(v->tile, TrackdirToTrack(GetVehicleTrackdir(v))); TryReserveRailTrack(v->tile, TrackdirToTrack(GetVehicleTrackdir(v)));