diff options
| author | smatz <smatz@openttd.org> | 2009-07-13 16:37:27 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-07-13 16:37:27 +0000 |
| commit | b6960e4e17c9d9464041d8c04907a5e1caf5c609 (patch) | |
| tree | 9a5101e644b98bd50bdb6d5f7adc7bbe17aee09a /src/economy.cpp | |
| parent | 868c21cbcc3b04e4e6649417ff94763a82c7d8b5 (diff) | |
| download | openttd-b6960e4e17c9d9464041d8c04907a5e1caf5c609.tar.xz | |
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
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 0006c564f..2c2077c0c 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -123,7 +123,7 @@ Money CalculateCompanyValue(const Company *c) if (v->type == VEH_TRAIN || v->type == VEH_ROAD || - (v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) || + (v->type == VEH_AIRCRAFT && Aircraft::From(v)->IsNormalAircraft()) || v->type == VEH_SHIP) { value += v->value * 3 >> 1; } @@ -1300,7 +1300,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) 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 (v->type == VEH_AIRCRAFT && !Aircraft::From(v)->IsNormalAircraft()) 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); |