diff options
| author | frosch <frosch@openttd.org> | 2008-12-13 18:25:42 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-12-13 18:25:42 +0000 |
| commit | c1d1ba22cc22e5b0527840d8aca4e70703261d62 (patch) | |
| tree | 0890693cd16487b25fae0ddc78f9d2f07a83bc94 /src/economy.cpp | |
| parent | a5b33d1f3bf8db9984f4a55ad86c546079509847 (diff) | |
| download | openttd-c1d1ba22cc22e5b0527840d8aca4e70703261d62.tar.xz | |
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
Now callback 12 is properly called also for 'mail'.
If the callback is not used, 'mail' uses 1/4 of property 7 (rounded up).
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index cf36d0945..9985c791c 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1603,6 +1603,10 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) if (v->cargo_cap == 0) continue; byte load_amount = EngInfo(v->engine_type)->load_amount; + + /* The default loadamount for mail is 1/4 of the load amount for passengers */ + if (v->type == VEH_AIRCRAFT && !IsNormalAircraft(v)) load_amount = (load_amount + 3) / 4; + if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); |