summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2008-07-26 22:00:59 +0000
committerfrosch <frosch@openttd.org>2008-07-26 22:00:59 +0000
commit4da23a628006a52fd3ed4735d3f04bee23d81ae0 (patch)
treea987c601962f070fc22977351feff696bc0daa4a
parent91486b116b64d28a2f646e88f4d0d2d540bbc76f (diff)
downloadopenttd-4da23a628006a52fd3ed4735d3f04bee23d81ae0.tar.xz
(svn r13844) -Fix (r13074, r13591): Power, running cost and capacity of multiheaded engines were (too often) doubled in newspaper resp. offer window.
-rw-r--r--src/engine_gui.cpp6
-rw-r--r--src/engine_type.h10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index fbe744c2f..948e61a82 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -137,15 +137,15 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
SetDParam(0, (_price.build_railvehicle >> 3) * GetEngineProperty(engine, 0x17, rvi->base_cost) >> 5);
SetDParam(2, GetEngineProperty(engine, 0x09, rvi->max_speed) * 10 / 16);
- SetDParam(3, GetEngineProperty(engine, 0x0B, rvi->power) << multihead);
+ SetDParam(3, GetEngineProperty(engine, 0x0B, rvi->power));
SetDParam(1, GetEngineProperty(engine, 0x16, rvi->weight) << multihead);
- SetDParam(4, GetEngineProperty(engine, 0x0D, rvi->running_cost) * GetPriceByIndex(rvi->running_cost_class) >> 8 << multihead);
+ SetDParam(4, GetEngineProperty(engine, 0x0D, rvi->running_cost) * GetPriceByIndex(rvi->running_cost_class) >> 8);
uint capacity = GetTotalCapacityOfArticulatedParts(engine, VEH_TRAIN);
if (capacity != 0) {
SetDParam(5, rvi->cargo_type);
- SetDParam(6, capacity << multihead);
+ SetDParam(6, capacity);
} else {
SetDParam(5, CT_INVALID);
}
diff --git a/src/engine_type.h b/src/engine_type.h
index db923d8b9..e6ed58377 100644
--- a/src/engine_type.h
+++ b/src/engine_type.h
@@ -36,15 +36,15 @@ enum EngineClass {
struct RailVehicleInfo {
byte image_index;
RailVehicleTypes railveh_type;
- byte base_cost;
+ byte base_cost; ///< Purchase cost factor; For multiheaded engines the sum of both engine prices.
RailTypeByte railtype;
uint16 max_speed;
- uint16 power;
- uint16 weight;
- byte running_cost;
+ uint16 power; ///< Power of engine; For multiheaded engines the sum of both engine powers.
+ uint16 weight; ///< Weight of vehicle; For multiheaded engines the weight of each single engine.
+ byte running_cost; ///< Running cost of engine; For multiheaded engines the sum of both running costs.
byte running_cost_class;
EngineClass engclass; ///< Class of engine for this vehicle
- byte capacity;
+ byte capacity; ///< Cargo capacity of vehicle; For multiheaded engines the capacity of each single engine.
CargoID cargo_type;
byte ai_rank;
byte ai_passenger_only; ///< Bit value to tell AI that this engine is for passenger use only