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/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h
This commit is contained in:
Jonathan G Rennison
2023-11-25 14:02:04 +00:00
parent 7fb369c732 2d3fef3113
commit 21b49a213e
100 changed files with 450 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc_cmd.cpp
View File

@@ -292,7 +292,7 @@ CommandCost CmdCheatSetting(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
return CommandCost();
case CHT_STATION_RATING:
cht = &_extra_cheats.station_rating;
cht = &_cheats.station_rating;
break;
case CHT_TOWN_RATING: