From 19f39f0fe0a74ca4885748c334509fdad7a9680d Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 11 Nov 2010 10:34:44 +0000 Subject: [PATCH] (svn r21145) -Fix: station list wasn't updated when a new cargo got a rating --- src/economy.cpp | 5 ++++- src/station_cmd.cpp | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/economy.cpp b/src/economy.cpp index ebeb4384c8..9961250058 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 1ce324cdf8..fd3f2eab53 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);