diff options
| author | peter1138 <peter1138@openttd.org> | 2008-05-13 20:39:57 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-05-13 20:39:57 +0000 |
| commit | eb112946a707a0457cecd4cc0b5e2a8c8c5cc33e (patch) | |
| tree | eeff2b9982348b174c4e5e2216cb0de7bb5d2b42 /src/build_vehicle_gui.cpp | |
| parent | 153acec334a3ad4eacc76699f16c30feb7558132 (diff) | |
| download | openttd-eb112946a707a0457cecd4cc0b5e2a8c8c5cc33e.tar.xz | |
(svn r13074) -Fix: For multiheaded engines, halve power and running cost when used instead of when loading, to allow callback values to work properly.
Diffstat (limited to 'src/build_vehicle_gui.cpp')
| -rw-r--r-- | src/build_vehicle_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index df75315a4..1908039a3 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -154,8 +154,8 @@ static int CDECL TrainEnginePowerSorter(const void *a, const void *b) const RailVehicleInfo *rvi_a = RailVehInfo(*(const EngineID*)a); const RailVehicleInfo *rvi_b = RailVehInfo(*(const EngineID*)b); - int va = rvi_a->power << (rvi_a->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0); - int vb = rvi_b->power << (rvi_b->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0); + int va = rvi_a->power; + int vb = rvi_b->power; int r = va - vb; return _internal_sort_order ? -r : r; @@ -538,7 +538,7 @@ static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, cons /* Max speed - Engine power */ SetDParam(0, GetEngineProperty(engine_number, 0x09, rvi->max_speed) * 10 / 16); - SetDParam(1, GetEngineProperty(engine_number, 0x0B, rvi->power) << multihead); + SetDParam(1, GetEngineProperty(engine_number, 0x0B, rvi->power)); DrawString(x, y, STR_PURCHASE_INFO_SPEED_POWER, TC_FROMSTRING); y += 10; @@ -551,7 +551,7 @@ static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, cons /* Running cost */ if (rvi->running_cost_class != 0xFF) { - SetDParam(0, (GetEngineProperty(engine_number, 0x0D, rvi->running_cost) * GetPriceByIndex(rvi->running_cost_class) >> 8) << multihead); + SetDParam(0, GetEngineProperty(engine_number, 0x0D, rvi->running_cost) * GetPriceByIndex(rvi->running_cost_class) >> 8); DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING); y += 10; } |