diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-18 14:28:26 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-18 14:28:26 +0000 |
| commit | 138e7233bce5ff5a9d20f54af80f6104303d6ca0 (patch) | |
| tree | 7defa635be3e9968a2d18b8f106a580f33964de9 /src/economy.cpp | |
| parent | c52a26a73f7fae70811ab3b6bb3599041cee530f (diff) | |
| download | openttd-138e7233bce5ff5a9d20f54af80f6104303d6ca0.tar.xz | |
(svn r17800) -Codechange: first steps into making CargoList a template
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 95a772cfc..1cba20776 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1162,7 +1162,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) if (HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) && !(u->current_order.GetUnloadType() & OUFB_TRANSFER)) { /* The cargo has reached it's final destination, the packets may now be destroyed */ - remaining = v->cargo.MoveTo(NULL, amount_unloaded, CargoList::MTA_FINAL_DELIVERY, payment, last_visited); + remaining = v->cargo.MoveTo<StationCargoList>(NULL, amount_unloaded, VehicleCargoList::MTA_FINAL_DELIVERY, payment, last_visited); result |= 1; accepted = true; @@ -1174,7 +1174,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) * station is still accepting the cargo in the vehicle. It doesn't * accept cargo that was loaded at the same station. */ if ((u->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) && (!accepted || v->cargo.Count() == cargo_count)) { - remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded, u->current_order.GetUnloadType() & OUFB_TRANSFER ? CargoList::MTA_TRANSFER : CargoList::MTA_UNLOAD, payment); + remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded, u->current_order.GetUnloadType() & OUFB_TRANSFER ? VehicleCargoList::MTA_TRANSFER : VehicleCargoList::MTA_UNLOAD, payment); SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP); result |= 2; @@ -1259,7 +1259,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) completely_emptied = false; anything_loaded = true; - ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, NULL, st->xy); + ge->cargo.MoveTo(&v->cargo, cap, StationCargoList::MTA_CARGO_LOAD, NULL, st->xy); st->time_since_load = 0; st->last_vehicle_type = v->type; |