(svn r15308) -Codechange: Deduplicate km-ish/h -> mph conversions.
This commit is contained in:
@@ -133,7 +133,7 @@ static void _DoCommandReturnBuildBridge1(class AIInstance *instance)
|
||||
{
|
||||
if (!IsValidBridge(bridge_id)) return -1;
|
||||
|
||||
return ::GetBridgeSpec(bridge_id)->speed;
|
||||
return ::GetBridgeSpec(bridge_id)->speed; // km-ish/h
|
||||
}
|
||||
|
||||
/* static */ Money AIBridge::GetPrice(BridgeID bridge_id, uint length)
|
||||
|
@@ -119,7 +119,7 @@
|
||||
if (!IsValidEngine(engine_id)) return -1;
|
||||
|
||||
const Engine *e = ::GetEngine(engine_id);
|
||||
int32 max_speed = e->GetDisplayMaxSpeed() * 16 / 10; // convert mph to km-ish/h
|
||||
int32 max_speed = e->GetDisplayMaxSpeed(); // km-ish/h
|
||||
if (e->type == VEH_AIRCRAFT) max_speed /= _settings_game.vehicle.plane_speed;
|
||||
return max_speed;
|
||||
}
|
||||
|
@@ -80,7 +80,7 @@ int32 AIEventEnginePreview::GetCapacity()
|
||||
int32 AIEventEnginePreview::GetMaxSpeed()
|
||||
{
|
||||
const Engine *e = ::GetEngine(engine);
|
||||
int32 max_speed = e->GetDisplayMaxSpeed() * 16 / 10; // convert mph to km-ish/h
|
||||
int32 max_speed = e->GetDisplayMaxSpeed(); // km-ish/h
|
||||
if (e->type == VEH_AIRCRAFT) max_speed /= _settings_game.vehicle.plane_speed;
|
||||
return max_speed;
|
||||
}
|
||||
|
@@ -278,7 +278,7 @@
|
||||
{
|
||||
if (!IsValidVehicle(vehicle_id)) return -1;
|
||||
|
||||
return ::GetVehicle(vehicle_id)->GetDisplaySpeed() * 16 / 10;
|
||||
return ::GetVehicle(vehicle_id)->GetDisplaySpeed(); // km-ish/h
|
||||
}
|
||||
|
||||
/* static */ AIVehicle::VehicleState AIVehicle::GetState(VehicleID vehicle_id)
|
||||
|
Reference in New Issue
Block a user