mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9815) -Fix (r9761) [FS#769): transfers weren't accounted in the vehicle profits.

release/0.6
rubidium 2007-05-08 16:42:48 +00:00
parent d098e88035
commit 2d86e87a3d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/economy.cpp
View File

@ -1509,9 +1509,10 @@ void VehiclePayment(Vehicle *front_v)
v->cargo_days, v->cargo_days,
v->cargo_type); v->cargo_type);
ge->feeder_profit += v->cargo_feeder_share; // transfer cargo transfer fees to station front_v->profit_this_year += virtual_profit;
total_cargo_feeder_share -= v->cargo_feeder_share; // accumulate deduction of feeder shares ge->feeder_profit += v->cargo_feeder_share + virtual_profit; // transfer cargo transfer fees to station
v->cargo_feeder_share = 0; // clear transfer cost total_cargo_feeder_share -= v->cargo_feeder_share; // accumulate deduction of feeder shares
v->cargo_feeder_share = 0; // clear transfer cost
/* keep total of cargo unloaded (pending) for accurate cargoshare calculation on load */ /* keep total of cargo unloaded (pending) for accurate cargoshare calculation on load */
SB(ge->unload_pending, 0, 12, GB(ge->unload_pending, 0, 12) + v->cargo_count); SB(ge->unload_pending, 0, 12, GB(ge->unload_pending, 0, 12) + v->cargo_count);