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

(svn r12586) -Codechange: do not access an order's refit variables directly.

Browse Source
This commit is contained in:
rubidium
2008-04-06 07:07:21 +00:00
parent 630d5ad766
commit e68b2088ce
6 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/order_cmd.cpp
View File

@@ -55,13 +55,12 @@ void Order::MakeGoToStation(StationID destination)
this->dest = destination;
}
void Order::MakeGoToDepot(DepotID destination, bool order)
void Order::MakeGoToDepot(DepotID destination, bool order, CargoID cargo, byte subtype)
{
this->type = OT_GOTO_DEPOT;
this->flags = order ? OFB_PART_OF_ORDERS : OFB_NON_STOP;
this->dest = destination;
this->refit_cargo = CT_NO_REFIT;
this->refit_subtype = 0;
this->SetRefit(cargo, subtype);
}
void Order::MakeGoToWaypoint(WaypointID destination)
@@ -88,6 +87,12 @@ void Order::MakeDummy()
this->flags = 0;
}
void Order::SetRefit(CargoID cargo, byte subtype)
{
this->refit_cargo = cargo;
this->refit_subtype = subtype;
}
void Order::FreeChain()
{
if (next != NULL) next->FreeChain();
@@ -1002,8 +1007,7 @@ CommandCost CmdOrderRefit(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (flags & DC_EXEC) {
Vehicle *u;
order->refit_cargo = cargo;
order->refit_subtype = subtype;
order->SetRefit(cargo, subtype);
u = GetFirstVehicleFromSharedList(v);
for (; u != NULL; u = u->next_shared) {
@@ -1012,8 +1016,7 @@ CommandCost CmdOrderRefit(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* If the vehicle already got the current depot set as current order, then update current order as well */
if (u->cur_order_index == order_number && HasBit(u->current_order.flags, OF_PART_OF_ORDERS)) {
u->current_order.refit_cargo = cargo;
u->current_order.refit_subtype = subtype;
u->current_order.SetRefit(cargo, subtype);
}
}
}