dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tiles/day speed unit in wallclock mode

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-03-31 17:02:27 +01:00
parent e041fb8b25
commit 6e689c2b93
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/strings.cpp
View File

@@ -769,12 +769,21 @@ struct UnitsLong {
};
/** Unit conversions for velocity. */
static const Units _units_velocity[] = {
{ { 1.0 }, STR_UNITS_VELOCITY_IMPERIAL, 0 },
{ { 1.609344 }, STR_UNITS_VELOCITY_METRIC, 0 },
{ { 0.44704 }, STR_UNITS_VELOCITY_SI, 0 },
static const Units _units_velocity_calendar[] = {
{ { 1.0 }, STR_UNITS_VELOCITY_IMPERIAL, 0 },
{ { 1.609344 }, STR_UNITS_VELOCITY_METRIC, 0 },
{ { 0.44704 }, STR_UNITS_VELOCITY_SI, 0 },
{ { 0.578125 }, STR_UNITS_VELOCITY_GAMEUNITS_DAY, 1 },
{ { 0.868976 }, STR_UNITS_VELOCITY_KNOTS, 0 },
{ { 0.868976 }, STR_UNITS_VELOCITY_KNOTS, 0 },
};
/** Unit conversions for velocity. */
static const Units _units_velocity_realtime[] = {
{ { 1.0 }, STR_UNITS_VELOCITY_IMPERIAL, 0 },
{ { 1.609344 }, STR_UNITS_VELOCITY_METRIC, 0 },
{ { 0.44704 }, STR_UNITS_VELOCITY_SI, 0 },
{ { 0.289352 }, STR_UNITS_VELOCITY_GAMEUNITS_SEC, 1 },
{ { 0.868976 }, STR_UNITS_VELOCITY_KNOTS, 0 },
};
/** Unit conversions for power. */
@@ -850,15 +859,20 @@ static const Units _units_time_years_or_minutes[] = {
};
/**
* Get index for velocity conversion units for a vehicle type.
* Get the correct velocity units depending on the vehicle type and whether we're using real-time units.
* @param type VehicleType to convert velocity for.
* @return Index within velocity conversion units for vehicle type.
* @return The Units for the proper vehicle and time mode.
*/
static byte GetVelocityUnits(VehicleType type)
static const Units GetVelocityUnits(VehicleType type)
{
if (type == VEH_SHIP || type == VEH_AIRCRAFT) return _settings_game.locale.units_velocity_nautical;
uint8_t setting = (type == VEH_SHIP || type == VEH_AIRCRAFT) ? _settings_game.locale.units_velocity_nautical : _settings_game.locale.units_velocity;
return _settings_game.locale.units_velocity;
assert(setting < lengthof(_units_velocity_calendar));
assert(setting < lengthof(_units_velocity_realtime));
if (EconTime::UsingWallclockUnits()) return _units_velocity_realtime[setting];
return _units_velocity_calendar[setting];
}
/**
@@ -871,7 +885,7 @@ uint ConvertSpeedToDisplaySpeed(uint speed, VehicleType type)
/* For historical reasons we don't want to mess with the
* conversion for speed. So, don't round it and keep the
* original conversion factors instead of the real ones. */
return _units_velocity[GetVelocityUnits(type)].c.ToDisplay(speed, false);
return GetVelocityUnits(type).c.ToDisplay(speed, false);
}
/**
@@ -881,8 +895,9 @@ uint ConvertSpeedToDisplaySpeed(uint speed, VehicleType type)
*/
uint ConvertSpeedToUnitDisplaySpeed(uint speed, VehicleType type)
{
uint result = ConvertSpeedToDisplaySpeed(speed, type);
for (uint i = 0; i < _units_velocity[_settings_game.locale.units_velocity].decimal_places; i++) {
const Units &units = GetVelocityUnits(type);
uint result = units.c.ToDisplay(speed, false);
for (uint i = 0; i < units.decimal_places; i++) {
result /= 10;
}
return result;
@@ -895,7 +910,7 @@ uint ConvertSpeedToUnitDisplaySpeed(uint speed, VehicleType type)
*/
uint ConvertDisplaySpeedToSpeed(uint speed, VehicleType type)
{
return _units_velocity[GetVelocityUnits(type)].c.FromDisplay(speed);
return GetVelocityUnits(type).c.FromDisplay(speed);
}
/**
@@ -905,7 +920,7 @@ uint ConvertDisplaySpeedToSpeed(uint speed, VehicleType type)
*/
uint ConvertKmhishSpeedToDisplaySpeed(uint speed, VehicleType type)
{
return _units_velocity[GetVelocityUnits(type)].c.ToDisplay(speed * 10, false) / 16;
return GetVelocityUnits(type).c.ToDisplay(speed * 10, false) / 16;
}
/**
@@ -915,7 +930,7 @@ uint ConvertKmhishSpeedToDisplaySpeed(uint speed, VehicleType type)
*/
uint ConvertDisplaySpeedToKmhishSpeed(uint speed, VehicleType type)
{
return _units_velocity[GetVelocityUnits(type)].c.FromDisplay(speed * 16, true, 10);
return GetVelocityUnits(type).c.FromDisplay(speed * 16, true, 10);
}
/**
@@ -1654,9 +1669,7 @@ static void FormatString(StringBuilder builder, const char *str_arg, StringParam
int64_t arg = args.GetNextParameter<int64_t>();
// Unpack vehicle type from packed argument to get desired units.
VehicleType vt = static_cast<VehicleType>(GB(arg, 56, 8));
byte units = GetVelocityUnits(vt);
assert(units < lengthof(_units_velocity));
const auto &x = _units_velocity[units];
const auto &x = GetVelocityUnits(vt);
auto tmp_params = MakeParameters(ConvertKmhishSpeedToDisplaySpeed(GB(arg, 0, 56), vt), x.decimal_places);
FormatString(builder, GetStringPtr(x.s), tmp_params);
break;