diff options
author | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
---|---|---|
committer | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
commit | 5bb79b1f46f2428f6416ad6d85b0e903ca9629b4 (patch) | |
tree | 2a816344a24a473c987d081d10d2a303be08e6cf /src/economy.cpp | |
parent | 05b125c42c0cb5e9241d96ea9d25d866094311bb (diff) | |
download | openttd-5bb79b1f46f2428f6416ad6d85b0e903ca9629b4.tar.xz |
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
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 9562dd5a1..ec4e1780a 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1180,7 +1180,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) payment->SetCargo(v->cargo_type); - if (HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) && !(u->current_order.GetUnloadType() & OUFB_TRANSFER)) { + if (HasBit(ge->acceptance_pickup, GoodsEntry::GES_ACCEPTANCE) && !(u->current_order.GetUnloadType() & OUFB_TRANSFER)) { /* The cargo has reached its final destination, the packets may now be destroyed */ remaining = v->cargo.MoveTo<StationCargoList>(NULL, amount_unloaded, VehicleCargoList::MTA_FINAL_DELIVERY, payment, last_visited); @@ -1195,9 +1195,9 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) * 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 ? VehicleCargoList::MTA_TRANSFER : VehicleCargoList::MTA_UNLOAD, payment); - if (!HasBit(ge->acceptance_pickup, GoodsEntry::PICKUP)) { + if (!HasBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP)) { InvalidateWindowData(WC_STATION_LIST, last_visited); - SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP); + SetBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP); } dirty_vehicle = dirty_station = true; |