diff options
author | rubidium <rubidium@openttd.org> | 2009-10-18 17:53:34 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-10-18 17:53:34 +0000 |
commit | e613107e02c5eb99532452811e8b9341199ceb29 (patch) | |
tree | 315f618588a592201e03a4db4828be34897ebd35 /src/economy.cpp | |
parent | f11cebfe9b09bf5cf815d37ca6a19212755251ab (diff) | |
download | openttd-e613107e02c5eb99532452811e8b9341199ceb29.tar.xz |
(svn r17808) -Codechange: remove write 'access' from all of CargoPacket's variables
Diffstat (limited to 'src/economy.cpp')
-rw-r--r-- | src/economy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 1cba20776..2fc5c34f9 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1035,7 +1035,7 @@ void CargoPayment::PayFinalDelivery(const CargoPacket *cp, uint count) } /* Handle end of route payment */ - Money profit = DeliverGoods(count, this->ct, this->current_station, cp->source_xy, cp->DaysInTransit(), this->owner, cp->source_type, cp->source_id); + Money profit = DeliverGoods(count, this->ct, this->current_station, cp->SourceStation(), cp->DaysInTransit(), this->owner, cp->SourceSubsidyType(), cp->SourceSubsidyID()); this->route_profit += profit; /* The vehicle's profit is whatever route profit there is minus feeder shares. */ @@ -1053,7 +1053,7 @@ Money CargoPayment::PayTransfer(const CargoPacket *cp, uint count) Money profit = GetTransportedGoodsIncome( count, /* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */ - DistanceManhattan(cp->loaded_at_xy, Station::Get(this->current_station)->xy), + DistanceManhattan(cp->LoadedAtXY(), Station::Get(this->current_station)->xy), cp->DaysInTransit(), this->ct); |