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/bridge_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/table/settings/gui_settings.ini
This commit is contained in:
Jonathan G Rennison
2023-11-12 14:14:56 +00:00
parent 524af62b8e 536d2cb75b
commit ec6cdce0c3
73 changed files with 800 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings_type.h
View File

@@ -78,6 +78,13 @@ enum ParticipateSurvey {
PS_YES,
};
/** Right-click to close window actions. */
enum RightClickClose : uint8_t {
RCC_NO = 0,
RCC_YES,
RCC_YES_EXCEPT_STICKY,
};
/** Settings related to the difficulty of the game */
struct DifficultySettings {
byte competitor_start_time; ///< Unused value, used to load old savegames.
@@ -209,7 +216,7 @@ struct GUISettings : public TimeSettings {
uint8 departure_conditionals; ///< how to handle conditional orders
bool departure_show_all_stops; ///< whether to show stops regardless of loading/unloading done at them
bool departure_merge_identical; ///< whether to merge identical departures
bool right_mouse_wnd_close; ///< close window with right click
RightClickClose right_click_wnd_close; ///< close window with right click
bool pause_on_newgame; ///< whether to start new games paused or not
SignalGUISettings signal_gui_mode; ///< select which signal types are shown in the signal GUI
SignalCycleSettings cycle_signal_types; ///< Which signal types to cycle with the build signal tool.
@@ -246,6 +253,7 @@ struct GUISettings : public TimeSettings {
bool show_veh_list_cargo_filter; ///< Show cargo list filter in UI
uint8 osk_activation; ///< Mouse gesture to trigger the OSK.
byte starting_colour; ///< default color scheme for the company to start a new game with
byte starting_colour_secondary; ///< default secondary color scheme for the company to start a new game with
bool show_newgrf_name; ///< Show the name of the NewGRF in the build vehicle window
bool show_cargo_in_vehicle_lists; ///< Show the cargoes the vehicles can carry in the list windows
bool show_wagon_intro_year; ///< Show the introduction year for wagons in the build vehicle window