summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-11 10:34:44 +0000
committerrubidium <rubidium@openttd.org>2010-11-11 10:34:44 +0000
commit67d071d0338affe7b8ed565a72150ff5d7513737 (patch)
tree38cd0bd3065a5e45463748078937e848c416d82a
parente745bd9815e8a92064c3fdb7b271cfe5ac80a95f (diff)
downloadopenttd-67d071d0338affe7b8ed565a72150ff5d7513737.tar.xz
(svn r21145) -Fix: station list wasn't updated when a new cargo got a rating
-rw-r--r--src/economy.cpp5
-rw-r--r--src/station_cmd.cpp6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index ebeb4384c..996125005 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1190,7 +1190,10 @@ 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);
- SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP);
+ if (!HasBit(ge->acceptance_pickup, GoodsEntry::PICKUP)) {
+ InvalidateWindowData(WC_STATION_LIST, last_visited);
+ SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP);
+ }
dirty_vehicle = dirty_station = true;
} else if (!accepted) {
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 1ce324cdf..fd3f2eab5 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -3201,7 +3201,11 @@ static uint UpdateStationWaiting(Station *st, CargoID type, uint amount, SourceT
if (amount == 0) return 0;
ge.cargo.Append(new CargoPacket(st->index, st->xy, amount, source_type, source_id));
- SetBit(ge.acceptance_pickup, GoodsEntry::PICKUP);
+
+ if (!HasBit(ge.acceptance_pickup, GoodsEntry::PICKUP)) {
+ InvalidateWindowData(WC_STATION_LIST, st->index);
+ SetBit(ge.acceptance_pickup, GoodsEntry::PICKUP);
+ }
TriggerStationAnimation(st, st->xy, SAT_NEW_CARGO, type);
AirportAnimationTrigger(st, AAT_STATION_NEW_CARGO, type);