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/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
This commit is contained in:
Jonathan G Rennison
2024-01-05 13:37:52 +00:00
parent f6a1f64efb 623df6b94f
commit 7f6b1d6b94
136 changed files with 1198 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/road_gui.cpp
View File

@@ -858,7 +858,7 @@ struct BuildRoadToolbarWindow : Window {
Window *CreateRoadTramToolbarForRoadType(RoadType roadtype, RoadTramType rtt)
{
Window* w = nullptr;
Window *w = nullptr;
switch (_game_mode) {
case GM_NORMAL:
w = ShowBuildRoadToolbar(roadtype);
@@ -883,7 +883,7 @@ Window *CreateRoadTramToolbarForRoadType(RoadType roadtype, RoadTramType rtt)
*/
static EventState RoadTramToolbarGlobalHotkeys(int hotkey, RoadType last_build, RoadTramType rtt)
{
Window* w = CreateRoadTramToolbarForRoadType(last_build, rtt);
Window *w = CreateRoadTramToolbarForRoadType(last_build, rtt);
if (w == nullptr) return ES_NOT_HANDLED;
return w->OnHotkey(hotkey);