summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-02-04 05:53:09 +0000
committerpeter1138 <peter1138@openttd.org>2007-02-04 05:53:09 +0000
commite724ada6743c414459220c6a16d43d5b20698182 (patch)
tree5b9eb3794f0f36ba62f14f6f0203dca28f855101
parent6c23767d3c9912f16d231debbc74564dacb441af (diff)
downloadopenttd-e724ada6743c414459220c6a16d43d5b20698182.tar.xz
(svn r8569) -Fix (r8464): revert properly
-rw-r--r--src/bridge_gui.cpp2
-rw-r--r--src/engine_gui.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 57e404e8a..e3d9fbf6d 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -50,7 +50,7 @@ static void BuildBridgeWndProc(Window *w, WindowEvent *e)
const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]];
SetDParam(2, _bridgedata.costs[i + w->vscroll.pos]);
- SetDParam(1, b->speed);
+ SetDParam(1, b->speed * 10 / 16);
SetDParam(0, b->material);
DrawSprite(b->sprite, b->pal, 3, 15 + i * 22);
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 1c1ac20de..ac80726bf 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -125,7 +125,7 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
uint multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD) ? 1 : 0;
SetDParam(0, (_price.build_railvehicle >> 3) * rvi->base_cost >> 5);
- SetDParam(2, rvi->max_speed);
+ SetDParam(2, rvi->max_speed * 10 / 16);
SetDParam(3, rvi->power << multihead);
SetDParam(1, rvi->weight << multihead);
@@ -173,7 +173,7 @@ static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw)
{
const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
SetDParam(0, (_price.aircraft_base >> 3) * avi->base_cost >> 5);
- SetDParam(1, avi->max_speed * 128 / 10);
+ SetDParam(1, avi->max_speed * 8);
SetDParam(2, avi->passenger_capacity);
SetDParam(3, avi->mail_capacity);
SetDParam(4, avi->running_cost * _price.aircraft_running >> 8);
@@ -213,7 +213,7 @@ static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw)
const RoadVehicleInfo *rvi = RoadVehInfo(engine);
SetDParam(0, (_price.roadveh_base >> 3) * rvi->base_cost >> 5);
- SetDParam(1, rvi->max_speed / 2);
+ SetDParam(1, rvi->max_speed * 10 / 32);
SetDParam(2, rvi->running_cost * _price.roadveh_running >> 8);
SetDParam(3, rvi->cargo_type);
SetDParam(4, rvi->capacity);
@@ -251,7 +251,7 @@ static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw)
{
const ShipVehicleInfo *svi = ShipVehInfo(engine);
SetDParam(0, svi->base_cost * (_price.ship_base >> 3) >> 5);
- SetDParam(1, svi->max_speed / 2);
+ SetDParam(1, svi->max_speed * 10 / 32);
SetDParam(2, svi->cargo_type);
SetDParam(3, svi->capacity);
SetDParam(4, svi->running_cost * _price.ship_running >> 8);