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

(svn r21807) -Codechange: split automatic order removal into a separate function (fonsinchen)

Browse Source
This commit is contained in:
rubidium
2011-01-15 18:14:29 +00:00
parent 53c9846f14
commit bc9afec3b0
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vehicle.cpp
View File

@@ -1736,6 +1736,18 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity)
return capacity;
}
/**
* Delete all automatic orders which were not reached.
*/
void Vehicle::DeleteUnreachedAutoOrders()
{
const Order *order = this->GetOrder(this->cur_order_index);
while (order != NULL && order->IsType(OT_AUTOMATIC)) {
/* Delete order effectively deletes order, so get the next before deleting it. */
order = order->next;
DeleteOrder(this, this->cur_order_index);
}
}
void Vehicle::BeginLoading()
{
@@ -1743,13 +1755,7 @@ void Vehicle::BeginLoading()
if (this->current_order.IsType(OT_GOTO_STATION) &&
this->current_order.GetDestination() == this->last_station_visited) {
/* Delete all automatic orders which were not reached */
const Order *order = this->GetOrder(this->cur_order_index);
while (order != NULL && order->IsType(OT_AUTOMATIC)) {
/* Delete order effectively deletes order, so get the next before deleting it. */
order = order->next;
DeleteOrder(this, this->cur_order_index);
}
this->DeleteUnreachedAutoOrders();
/* Now cur_order_index points to the destination station, and we can start loading */
this->current_order.MakeLoading(true);

2
src/vehicle_base.h
View File

@@ -243,6 +243,8 @@ public:
GroundVehicleCache *GetGroundVehicleCache();
const GroundVehicleCache *GetGroundVehicleCache() const;
void DeleteUnreachedAutoOrders();
/**
* Handle the loading of the vehicle; when not it skips through dummy
* orders and does nothing in all other cases.