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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-06-07 21:28:46 +01:00
parent d3fbe88a9c 3a03a12a9c
commit 02549c5224
129 changed files with 2080 additions and 2061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tracerestrict_gui.cpp
View File

@@ -1003,8 +1003,8 @@ static uint ConvertIntegerValue(TraceRestrictValueType type, uint in, bool to_di
case TRVT_FORCE:
return to_display
? ConvertForceToDisplayForce(in)
: ConvertDisplayForceToForce(in);
? ConvertForceToDisplayForce(static_cast<int64>(in) * 1000)
: static_cast<uint>(ConvertDisplayForceToForce(in) / 1000);
break;
case TRVT_PF_PENALTY:
@@ -1031,7 +1031,7 @@ static void ConvertValueToDecimal(TraceRestrictValueType type, uint in, int64 &v
break;
case TRVT_FORCE_WEIGHT_RATIO:
ConvertForceWeightRatioToDisplay(in, value, decimal);
ConvertForceWeightRatioToDisplay(static_cast<int64>(in) * 1000, value, decimal);
break;
case TRVT_SPEED:
@@ -1054,7 +1054,7 @@ static uint ConvertDecimalToValue(TraceRestrictValueType type, double in)
return ConvertDisplayToPowerWeightRatio(in);
case TRVT_FORCE_WEIGHT_RATIO:
return ConvertDisplayToForceWeightRatio(in);
return ConvertDisplayToForceWeightRatio(in) / 1000;
case TRVT_SPEED:
return ConvertDisplaySpeedToKmhishSpeed(in * (_settings_game.locale.units_velocity == 3 ? 10 : 1), VEH_TRAIN);
@@ -1393,7 +1393,8 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
case TRVT_FORCE:
instruction_string = STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_FORCE;
DrawInstructionStringConditionalIntegerCommon(item, properties);
DrawInstructionStringConditionalCommon(item, properties);
SetDParam(3, GetTraceRestrictValue(item) * 1000);
break;
case TRVT_POWER_WEIGHT_RATIO:
@@ -1403,7 +1404,8 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
case TRVT_FORCE_WEIGHT_RATIO:
instruction_string = STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_FORCE_WEIGHT_RATIO;
DrawInstructionStringConditionalIntegerCommon(item, properties);
DrawInstructionStringConditionalCommon(item, properties);
SetDParam(3, GetTraceRestrictValue(item) * 1000);
break;
case TRVT_SLOT_INDEX: