(svn r8569) -Fix (r8464): revert properly

This commit is contained in:
peter1138 2007-02-04 05:53:09 +00:00
parent 6c23767d3c
commit e724ada674
2 changed files with 5 additions and 5 deletions

View File

@ -50,7 +50,7 @@ static void BuildBridgeWndProc(Window *w, WindowEvent *e)
const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]]; const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]];
SetDParam(2, _bridgedata.costs[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); SetDParam(0, b->material);
DrawSprite(b->sprite, b->pal, 3, 15 + i * 22); DrawSprite(b->sprite, b->pal, 3, 15 + i * 22);

View File

@ -125,7 +125,7 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
uint multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD) ? 1 : 0; uint multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD) ? 1 : 0;
SetDParam(0, (_price.build_railvehicle >> 3) * rvi->base_cost >> 5); 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(3, rvi->power << multihead);
SetDParam(1, rvi->weight << 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); const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
SetDParam(0, (_price.aircraft_base >> 3) * avi->base_cost >> 5); 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(2, avi->passenger_capacity);
SetDParam(3, avi->mail_capacity); SetDParam(3, avi->mail_capacity);
SetDParam(4, avi->running_cost * _price.aircraft_running >> 8); 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); const RoadVehicleInfo *rvi = RoadVehInfo(engine);
SetDParam(0, (_price.roadveh_base >> 3) * rvi->base_cost >> 5); 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(2, rvi->running_cost * _price.roadveh_running >> 8);
SetDParam(3, rvi->cargo_type); SetDParam(3, rvi->cargo_type);
SetDParam(4, rvi->capacity); SetDParam(4, rvi->capacity);
@ -251,7 +251,7 @@ static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw)
{ {
const ShipVehicleInfo *svi = ShipVehInfo(engine); const ShipVehicleInfo *svi = ShipVehInfo(engine);
SetDParam(0, svi->base_cost * (_price.ship_base >> 3) >> 5); 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(2, svi->cargo_type);
SetDParam(3, svi->capacity); SetDParam(3, svi->capacity);
SetDParam(4, svi->running_cost * _price.ship_running >> 8); SetDParam(4, svi->running_cost * _price.ship_running >> 8);