mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 11:22:45 +01:00
Code Issues Releases Wiki Activity

Change: Merge Game Options and Game Settings together.

Browse Source 
Game Settings is now an additional 'Advanced' tab in the Game Options window.
This commit is contained in:
Peter Nelson
2024-12-31 11:47:40 +00:00
committed by Peter Nelson
parent 6f056283f2
commit a4dc7249ee
7 changed files with 608 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/toolbar_gui.cpp
View File

@@ -228,7 +228,6 @@ static CallBackFunction ToolbarFastForwardClick(Window *)
*/
enum OptionMenuEntries : uint8_t {
OME_GAMEOPTIONS,
OME_SETTINGS,
OME_AI_SETTINGS,
OME_GAMESCRIPT_SETTINGS,
OME_NEWGRFSETTINGS,
@@ -261,7 +260,6 @@ static CallBackFunction ToolbarOptionsClick(Window *w)
{
DropDownList list;
list.push_back(MakeDropDownListStringItem(STR_SETTINGS_MENU_GAME_OPTIONS, OME_GAMEOPTIONS));
list.push_back(MakeDropDownListStringItem(STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE, OME_SETTINGS));
/* Changes to the per-AI settings don't get send from the server to the clients. Clients get
* the settings once they join but never update it. As such don't show the window at all
* to network clients. */
@@ -306,7 +304,6 @@ static CallBackFunction MenuClickSettings(int index)
{
switch (index) {
case OME_GAMEOPTIONS: ShowGameOptions(); return CBF_NONE;
case OME_SETTINGS: ShowGameSettings(); return CBF_NONE;
case OME_AI_SETTINGS: ShowAIConfigWindow(); return CBF_NONE;
case OME_GAMESCRIPT_SETTINGS: ShowGSConfigWindow(); return CBF_NONE;
case OME_NEWGRFSETTINGS: ShowNewGRFSettings(!_networking && _settings_client.gui.UserIsAllowedToChangeNewGRFs(), true, true, _grfconfig); return CBF_NONE;