diff options
author | rubidium <rubidium@openttd.org> | 2009-06-29 19:55:36 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-06-29 19:55:36 +0000 |
commit | 985608c71332b413b2abe2bbf89a140c2c19d8f1 (patch) | |
tree | dc2ea79e6123a72f2407bc63234c81cbb20dd709 /src/vehicle_base.h | |
parent | 80043e688e7e70eae69e1fad6d8a26caf19e3067 (diff) | |
download | openttd-985608c71332b413b2abe2bbf89a140c2c19d8f1.tar.xz |
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
* cheating by starting to unload and after getting paid rushing to the depot to get sold (or unloading, loading and getting paid again for the remainder)
* cargo being dropped onto a station at the moment a stockpiling industry doesn't accept it anymore
* industries getting cargo that has not been unloaded yet and subsequently dumping it back on the station in one go
Note: you will now get paid after the unloading has finished, so you'll have to wait a bit longer for 'your' money.
Diffstat (limited to 'src/vehicle_base.h')
-rw-r--r-- | src/vehicle_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vehicle_base.h b/src/vehicle_base.h index 795e48a71..8cb9e7761 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -91,7 +91,9 @@ public: Money profit_this_year; ///< Profit this year << 8, low 8 bits are fract Money profit_last_year; ///< Profit last year << 8, low 8 bits are fract - Money value; + Money value; ///< Value of the vehicle + + CargoPayment *cargo_payment; ///< The cargo payment we're currently in /* Used for timetabling. */ uint32 current_order_time; ///< How many ticks have passed since this order started. |