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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-04-10 15:11:53 +01:00
parent f8f7f436ae 1321e48465
commit 82803b98e0
104 changed files with 527 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tracerestrict_gui.cpp
View File

@@ -979,8 +979,8 @@ static uint ConvertIntegerValue(TraceRestrictValueType type, uint in, bool to_di
case TRVT_SPEED:
return to_display
? ConvertKmhishSpeedToDisplaySpeed(in)
: ConvertDisplaySpeedToKmhishSpeed(in);
? ConvertKmhishSpeedToDisplaySpeed(in, VEH_TRAIN)
: ConvertDisplaySpeedToKmhishSpeed(in, VEH_TRAIN);
case TRVT_WEIGHT:
return to_display
@@ -1029,7 +1029,7 @@ static void ConvertValueToDecimal(TraceRestrictValueType type, uint in, int64 &v
case TRVT_SPEED:
decimal = _settings_game.locale.units_velocity == 3 ? 1 : 0;
value = ConvertKmhishSpeedToDisplaySpeed(in);
value = ConvertKmhishSpeedToDisplaySpeed(in, VEH_TRAIN);
break;
default:
@@ -1050,7 +1050,7 @@ static uint ConvertDecimalToValue(TraceRestrictValueType type, double in)
return ConvertDisplayToForceWeightRatio(in);
case TRVT_SPEED:
return ConvertDisplaySpeedToKmhishSpeed(in * (_settings_game.locale.units_velocity == 3 ? 10 : 1));
return ConvertDisplaySpeedToKmhishSpeed(in * (_settings_game.locale.units_velocity == 3 ? 10 : 1), VEH_TRAIN);
default:
NOT_REACHED();