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

6
src/misc_gui.cpp
View File

@@ -291,7 +291,7 @@ public:
/* Rail speed limit */
if (td.rail_speed != 0) {
SetDParam(0, td.rail_speed);
SetDParam(0, PackVelocity(td.rail_speed, VEH_TRAIN));
this->landinfo_data.push_back(GetString(STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT));
}
@@ -315,7 +315,7 @@ public:
/* Road speed limit */
if (td.road_speed != 0) {
SetDParam(0, td.road_speed);
SetDParam(0, PackVelocity(td.road_speed, VEH_ROAD));
this->landinfo_data.push_back(GetString(STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT));
}
@@ -327,7 +327,7 @@ public:
/* Tram speed limit */
if (td.tram_speed != 0) {
SetDParam(0, td.tram_speed);
SetDParam(0, PackVelocity(td.tram_speed, VEH_ROAD));
this->landinfo_data.push_back(GetString(STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT));
}