From 74b0b080e7e14b423bf558c424a8784815aaa99b Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 5 Apr 2026 18:10:45 +0100 Subject: [PATCH] Codechange: make AbstractFileType a scoped enum --- src/console_cmds.cpp | 16 +++++----- src/fileio_type.h | 38 +++++++++++----------- src/fios.cpp | 10 +++--- src/fios_gui.cpp | 58 +++++++++++++++++----------------- src/intro_gui.cpp | 6 ++-- src/network/network_gui.cpp | 6 ++-- src/network/network_server.cpp | 6 ++-- src/openttd.cpp | 12 +++---- src/saveload/afterload.cpp | 2 +- src/saveload/saveload.cpp | 2 +- src/saveload/signs_sl.cpp | 2 +- src/toolbar_gui.cpp | 14 ++++---- src/town_gui.cpp | 2 +- 13 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index e358109204..09a0bec421 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -120,9 +120,9 @@ public: bool file_list_valid = false; ///< If set, the file list is valid. }; -static ConsoleFileList _console_file_list_savegame{FT_SAVEGAME, true}; ///< File storage cache for savegames. -static ConsoleFileList _console_file_list_scenario{FT_SCENARIO, false}; ///< File storage cache for scenarios. -static ConsoleFileList _console_file_list_heightmap{FT_HEIGHTMAP, false}; ///< File storage cache for heightmaps. +static ConsoleFileList _console_file_list_savegame{AbstractFileType::Savegame, true}; ///< File storage cache for savegames. +static ConsoleFileList _console_file_list_scenario{AbstractFileType::Scenario, false}; ///< File storage cache for scenarios. +static ConsoleFileList _console_file_list_heightmap{AbstractFileType::Heightmap, false}; ///< File storage cache for heightmaps. /**************** * command hooks @@ -467,7 +467,7 @@ static bool ConLoad(std::span argv) _console_file_list_savegame.ValidateFileList(); const FiosItem *item = _console_file_list_savegame.FindItem(file); if (item != nullptr) { - if (item->type.abstract == FT_SAVEGAME) { + if (item->type.abstract == AbstractFileType::Savegame) { _switch_mode = SM_LOAD_GAME; _file_to_saveload.Set(*item); } else { @@ -494,7 +494,7 @@ static bool ConLoadScenario(std::span argv) _console_file_list_scenario.ValidateFileList(); const FiosItem *item = _console_file_list_scenario.FindItem(file); if (item != nullptr) { - if (item->type.abstract == FT_SCENARIO) { + if (item->type.abstract == AbstractFileType::Scenario) { _switch_mode = SM_LOAD_GAME; _file_to_saveload.Set(*item); } else { @@ -521,7 +521,7 @@ static bool ConLoadHeightmap(std::span argv) _console_file_list_heightmap.ValidateFileList(); const FiosItem *item = _console_file_list_heightmap.FindItem(file); if (item != nullptr) { - if (item->type.abstract == FT_HEIGHTMAP) { + if (item->type.abstract == AbstractFileType::Heightmap) { _switch_mode = SM_START_HEIGHTMAP; _file_to_saveload.Set(*item); } else { @@ -548,7 +548,7 @@ static bool ConRemove(std::span argv) _console_file_list_savegame.ValidateFileList(); const FiosItem *item = _console_file_list_savegame.FindItem(file); if (item != nullptr) { - if (item->type.abstract == FT_SAVEGAME) { + if (item->type.abstract == AbstractFileType::Savegame) { if (!FioRemove(item->name)) { IConsolePrint(CC_ERROR, "Failed to delete '{}'.", item->name); } @@ -1407,7 +1407,7 @@ static bool ConReload(std::span argv) return true; } - if (_file_to_saveload.ftype.abstract == FT_NONE || _file_to_saveload.ftype.abstract == FT_INVALID) { + if (_file_to_saveload.ftype.abstract == AbstractFileType::None || _file_to_saveload.ftype.abstract == AbstractFileType::Invalid) { IConsolePrint(CC_ERROR, "No game loaded to reload."); return true; } diff --git a/src/fileio_type.h b/src/fileio_type.h index 5e33e33e7a..f47eab2417 100644 --- a/src/fileio_type.h +++ b/src/fileio_type.h @@ -14,14 +14,14 @@ #include "misc/autorelease.hpp" /** The different abstract types of files that the system knows about. */ -enum AbstractFileType : uint8_t { - FT_NONE, ///< nothing to do - FT_SAVEGAME, ///< old or new savegame - FT_SCENARIO, ///< old or new scenario - FT_HEIGHTMAP, ///< heightmap file - FT_TOWN_DATA, ///< town data file +enum class AbstractFileType : uint8_t { + None, ///< nothing to do + Savegame, ///< old or new savegame + Scenario, ///< old or new scenario + Heightmap, ///< heightmap file + TownData, ///< town data file - FT_INVALID = 7, ///< Invalid or unknown file type. + Invalid = 7, ///< Invalid or unknown file type. }; /** Kinds of files in each #AbstractFileType. */ @@ -67,20 +67,20 @@ struct FiosType { constexpr bool operator==(const FiosType &) const noexcept = default; }; -constexpr FiosType FIOS_TYPE_DRIVE{FT_NONE, DFT_FIOS_DRIVE}; -constexpr FiosType FIOS_TYPE_PARENT{FT_NONE, DFT_FIOS_PARENT}; -constexpr FiosType FIOS_TYPE_DIR{FT_NONE, DFT_FIOS_DIR}; -constexpr FiosType FIOS_TYPE_DIRECT{FT_NONE, DFT_FIOS_DIRECT}; +constexpr FiosType FIOS_TYPE_DRIVE{AbstractFileType::None, DFT_FIOS_DRIVE}; +constexpr FiosType FIOS_TYPE_PARENT{AbstractFileType::None, DFT_FIOS_PARENT}; +constexpr FiosType FIOS_TYPE_DIR{AbstractFileType::None, DFT_FIOS_DIR}; +constexpr FiosType FIOS_TYPE_DIRECT{AbstractFileType::None, DFT_FIOS_DIRECT}; -constexpr FiosType FIOS_TYPE_FILE{FT_SAVEGAME, DFT_GAME_FILE}; -constexpr FiosType FIOS_TYPE_OLDFILE{FT_SAVEGAME, DFT_OLD_GAME_FILE}; -constexpr FiosType FIOS_TYPE_SCENARIO{FT_SCENARIO, DFT_GAME_FILE}; -constexpr FiosType FIOS_TYPE_OLD_SCENARIO{FT_SCENARIO, DFT_OLD_GAME_FILE}; -constexpr FiosType FIOS_TYPE_PNG{FT_HEIGHTMAP, DFT_HEIGHTMAP_PNG}; -constexpr FiosType FIOS_TYPE_BMP{FT_HEIGHTMAP, DFT_HEIGHTMAP_BMP}; -constexpr FiosType FIOS_TYPE_JSON{FT_TOWN_DATA, DFT_TOWN_DATA_JSON}; +constexpr FiosType FIOS_TYPE_FILE{AbstractFileType::Savegame, DFT_GAME_FILE}; +constexpr FiosType FIOS_TYPE_OLDFILE{AbstractFileType::Savegame, DFT_OLD_GAME_FILE}; +constexpr FiosType FIOS_TYPE_SCENARIO{AbstractFileType::Scenario, DFT_GAME_FILE}; +constexpr FiosType FIOS_TYPE_OLD_SCENARIO{AbstractFileType::Scenario, DFT_OLD_GAME_FILE}; +constexpr FiosType FIOS_TYPE_PNG{AbstractFileType::Heightmap, DFT_HEIGHTMAP_PNG}; +constexpr FiosType FIOS_TYPE_BMP{AbstractFileType::Heightmap, DFT_HEIGHTMAP_BMP}; +constexpr FiosType FIOS_TYPE_JSON{AbstractFileType::TownData, DFT_TOWN_DATA_JSON}; -constexpr FiosType FIOS_TYPE_INVALID{FT_INVALID, DFT_INVALID}; +constexpr FiosType FIOS_TYPE_INVALID{AbstractFileType::Invalid, DFT_INVALID}; /** * The different kinds of subdirectories OpenTTD uses diff --git a/src/fios.cpp b/src/fios.cpp index 1cf15d945a..06513ed114 100644 --- a/src/fios.cpp +++ b/src/fios.cpp @@ -60,22 +60,22 @@ void FileList::BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperati assert(fop == SLO_LOAD || fop == SLO_SAVE); switch (abstract_filetype) { - case FT_NONE: + case AbstractFileType::None: break; - case FT_SAVEGAME: + case AbstractFileType::Savegame: FiosGetSavegameList(fop, show_dirs, *this); break; - case FT_SCENARIO: + case AbstractFileType::Scenario: FiosGetScenarioList(fop, show_dirs, *this); break; - case FT_HEIGHTMAP: + case AbstractFileType::Heightmap: FiosGetHeightmapList(fop, show_dirs, *this); break; - case FT_TOWN_DATA: + case AbstractFileType::TownData: FiosGetTownDataList(fop, show_dirs, *this); break; diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index 50f47fab69..64abe873a8 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -383,7 +383,7 @@ private: } else { save_load_window->InvalidateData(SLIWD_RESCAN_FILES); /* Reset file name to current date on successful delete */ - if (save_load_window->abstract_filetype == FT_SAVEGAME) save_load_window->GenerateFileName(); + if (save_load_window->abstract_filetype == AbstractFileType::Savegame) save_load_window->GenerateFileName(); } } } @@ -404,12 +404,12 @@ public: /* For saving, construct an initial file name. */ if (this->fop == SLO_SAVE) { switch (this->abstract_filetype) { - case FT_SAVEGAME: + case AbstractFileType::Savegame: this->GenerateFileName(); break; - case FT_SCENARIO: - case FT_HEIGHTMAP: + case AbstractFileType::Scenario: + case AbstractFileType::Heightmap: this->filename_editbox.text.Assign("UNNAMED"); break; @@ -422,26 +422,26 @@ public: this->filename_editbox.ok_button = WID_SL_SAVE_GAME; this->CreateNestedTree(); - if (this->fop == SLO_LOAD && this->abstract_filetype == FT_SAVEGAME) { + if (this->fop == SLO_LOAD && this->abstract_filetype == AbstractFileType::Savegame) { this->GetWidget(WID_SL_CONTENT_DOWNLOAD_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL); } /* Select caption string of the window. */ StringID caption_string; switch (this->abstract_filetype) { - case FT_SAVEGAME: + case AbstractFileType::Savegame: caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_CAPTION : STR_SAVELOAD_LOAD_CAPTION; break; - case FT_SCENARIO: + case AbstractFileType::Scenario: caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_SCENARIO : STR_SAVELOAD_LOAD_SCENARIO; break; - case FT_HEIGHTMAP: + case AbstractFileType::Heightmap: caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_HEIGHTMAP : STR_SAVELOAD_LOAD_HEIGHTMAP; break; - case FT_TOWN_DATA: + case AbstractFileType::TownData: caption_string = STR_SAVELOAD_LOAD_TOWN_DATA; // It's not currently possible to save town data. break; @@ -471,16 +471,16 @@ public: /* Select the initial directory. */ o_dir.type = FIOS_TYPE_DIRECT; switch (this->abstract_filetype) { - case FT_SAVEGAME: + case AbstractFileType::Savegame: o_dir.name = FioFindDirectory(SAVE_DIR); break; - case FT_SCENARIO: + case AbstractFileType::Scenario: o_dir.name = FioFindDirectory(SCENARIO_DIR); break; - case FT_HEIGHTMAP: - case FT_TOWN_DATA: + case AbstractFileType::Heightmap: + case AbstractFileType::TownData: o_dir.name = FioFindDirectory(HEIGHTMAP_DIR); break; @@ -614,14 +614,14 @@ public: if (tr.top > tr.bottom) return; /* Hide current date for scenarios */ - if (this->abstract_filetype != FT_SCENARIO) { + if (this->abstract_filetype != AbstractFileType::Scenario) { /* Current date */ DrawString(tr, GetString(STR_NETWORK_SERVER_LIST_CURRENT_DATE, _load_check_data.current_date)); tr.top += GetCharacterHeight(FS_NORMAL); } /* Hide the NewGRF stuff when saving. We also hide the button. */ - if (this->fop == SLO_LOAD && (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO)) { + if (this->fop == SLO_LOAD && (this->abstract_filetype == AbstractFileType::Savegame || this->abstract_filetype == AbstractFileType::Scenario)) { tr.top += WidgetDimensions::scaled.vsep_normal; if (tr.top > tr.bottom) return; @@ -632,7 +632,7 @@ public: if (tr.top > tr.bottom) return; /* Hide the company stuff for scenarios */ - if (this->abstract_filetype != FT_SCENARIO) { + if (this->abstract_filetype != AbstractFileType::Scenario) { tr.top += WidgetDimensions::scaled.vsep_wide; if (tr.top > tr.bottom) return; @@ -713,10 +713,10 @@ public: _file_to_saveload.Set(*this->selected); - if (this->abstract_filetype == FT_HEIGHTMAP) { + if (this->abstract_filetype == AbstractFileType::Heightmap) { this->Close(); ShowHeightmapLoad(); - } else if (this->abstract_filetype == FT_TOWN_DATA) { + } else if (this->abstract_filetype == AbstractFileType::TownData) { this->Close(); LoadTownData(); } else if (!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GRFListCompatibility::NotFound || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) { @@ -774,10 +774,10 @@ public: } else if (!_load_check_data.HasErrors()) { this->selected = file; if (this->fop == SLO_LOAD) { - if (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO || this->abstract_filetype == FT_TOWN_DATA) { + if (this->abstract_filetype == AbstractFileType::Savegame || this->abstract_filetype == AbstractFileType::Scenario || this->abstract_filetype == AbstractFileType::TownData) { this->OnClick(pt, WID_SL_LOAD_BUTTON, 1); } else { - assert(this->abstract_filetype == FT_HEIGHTMAP); + assert(this->abstract_filetype == AbstractFileType::Heightmap); _file_to_saveload.Set(*file); this->Close(); @@ -795,8 +795,8 @@ public: assert(this->fop == SLO_LOAD); switch (this->abstract_filetype) { default: NOT_REACHED(); - case FT_SCENARIO: ShowNetworkContentListWindow(nullptr, CONTENT_TYPE_SCENARIO); break; - case FT_HEIGHTMAP: ShowNetworkContentListWindow(nullptr, CONTENT_TYPE_HEIGHTMAP); break; + case AbstractFileType::Scenario: ShowNetworkContentListWindow(nullptr, CONTENT_TYPE_SCENARIO); break; + case AbstractFileType::Heightmap: ShowNetworkContentListWindow(nullptr, CONTENT_TYPE_HEIGHTMAP); break; } } break; @@ -849,7 +849,7 @@ public: ShowQuery(GetEncodedString(STR_SAVELOAD_DELETE_TITLE), GetEncodedString(STR_SAVELOAD_DELETE_WARNING), this, SaveLoadWindow::DeleteFileConfirmationCallback); } else if (this->IsWidgetLowered(WID_SL_SAVE_GAME)) { // Save button clicked - if (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO) { + if (this->abstract_filetype == AbstractFileType::Savegame || this->abstract_filetype == AbstractFileType::Scenario) { _file_to_saveload.name = FiosMakeSavegameName(this->filename_editbox.text.GetText()); if (FioCheckFileExists(_file_to_saveload.name, Subdirectory::SAVE_DIR)) { ShowQuery(GetEncodedString(STR_SAVELOAD_OVERWRITE_TITLE), GetEncodedString(STR_SAVELOAD_OVERWRITE_WARNING), @@ -939,13 +939,13 @@ public: if (this->fop != SLO_LOAD) break; switch (this->abstract_filetype) { - case FT_HEIGHTMAP: - case FT_TOWN_DATA: + case AbstractFileType::Heightmap: + case AbstractFileType::TownData: this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON, this->selected == nullptr || _load_check_data.HasErrors()); break; - case FT_SAVEGAME: - case FT_SCENARIO: { + case AbstractFileType::Savegame: + case AbstractFileType::Scenario: { bool disabled = this->selected == nullptr || _load_check_data.HasErrors(); if (!_settings_client.gui.UserIsAllowedToChangeNewGRFs()) { disabled |= _load_check_data.HasNewGrfs() && _load_check_data.grf_compatibility == GRFListCompatibility::NotFound; @@ -1028,11 +1028,11 @@ void ShowSaveLoadDialog(AbstractFileType abstract_filetype, SaveLoadOperation fo } else { /* Dialogue for loading a file. */ switch (abstract_filetype) { - case FT_HEIGHTMAP: + case AbstractFileType::Heightmap: new SaveLoadWindow(_load_heightmap_dialog_desc, abstract_filetype, fop); break; - case FT_TOWN_DATA: + case AbstractFileType::TownData: new SaveLoadWindow(_load_town_data_dialog_desc, abstract_filetype, fop); break; diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index c9561abc2b..3df5ed2101 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -304,15 +304,15 @@ struct SelectGameWindow : public Window { break; case WID_SGI_LOAD_GAME: _is_network_server = false; - ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Savegame, SLO_LOAD); break; case WID_SGI_PLAY_SCENARIO: _is_network_server = false; - ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Scenario, SLO_LOAD); break; case WID_SGI_PLAY_HEIGHTMAP: _is_network_server = false; - ShowSaveLoadDialog(FT_HEIGHTMAP,SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Heightmap,SLO_LOAD); break; case WID_SGI_EDIT_SCENARIO: _is_network_server = false; diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index db7a7054bb..cbba606fe4 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1090,19 +1090,19 @@ struct NetworkStartServerWindow : public Window { case WID_NSS_LOAD_GAME: if (!CheckServerName()) return; _is_network_server = true; - ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Savegame, SLO_LOAD); break; case WID_NSS_PLAY_SCENARIO: if (!CheckServerName()) return; _is_network_server = true; - ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Scenario, SLO_LOAD); break; case WID_NSS_PLAY_HEIGHTMAP: if (!CheckServerName()) return; _is_network_server = true; - ShowSaveLoadDialog(FT_HEIGHTMAP, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::Heightmap, SLO_LOAD); break; } } diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index f427d06008..4fef4d3343 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1874,12 +1874,12 @@ static void NetworkRestartMap() { _settings_newgame.game_creation.generation_seed = GENERATE_NEW_SEED; switch (_file_to_saveload.ftype.abstract) { - case FT_SAVEGAME: - case FT_SCENARIO: + case AbstractFileType::Savegame: + case AbstractFileType::Scenario: _switch_mode = SM_LOAD_GAME; break; - case FT_HEIGHTMAP: + case AbstractFileType::Heightmap: _switch_mode = SM_START_HEIGHTMAP; break; diff --git a/src/openttd.cpp b/src/openttd.cpp index 7de9e0cf12..96351e5dd3 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -586,9 +586,9 @@ int openttd_main(std::span arguments) /* Allow for '-e' before or after '-g'. */ switch (ft.abstract) { - case FT_SAVEGAME: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break; - case FT_SCENARIO: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break; - case FT_HEIGHTMAP: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP); break; + case AbstractFileType::Savegame: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break; + case AbstractFileType::Scenario: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break; + case AbstractFileType::Heightmap: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP); break; default: break; } @@ -1068,12 +1068,12 @@ void SwitchToMode(SwitchMode new_mode) break; case SM_RELOADGAME: // Reload with what-ever started the game - if (_file_to_saveload.ftype.abstract == FT_SAVEGAME || _file_to_saveload.ftype.abstract == FT_SCENARIO) { + if (_file_to_saveload.ftype.abstract == AbstractFileType::Savegame || _file_to_saveload.ftype.abstract == AbstractFileType::Scenario) { /* Reload current savegame/scenario */ _switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME; SwitchToMode(_switch_mode); break; - } else if (_file_to_saveload.ftype.abstract == FT_HEIGHTMAP) { + } else if (_file_to_saveload.ftype.abstract == AbstractFileType::Heightmap) { /* Restart current heightmap */ _switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_RESTART_HEIGHTMAP; SwitchToMode(_switch_mode); @@ -1101,7 +1101,7 @@ void SwitchToMode(SwitchMode new_mode) if (!SafeLoad(_file_to_saveload.name, _file_to_saveload.file_op, _file_to_saveload.ftype.detailed, GM_NORMAL, NO_DIRECTORY)) { ShowErrorMessage(GetSaveLoadErrorType(), GetSaveLoadErrorMessage(), WL_CRITICAL); } else { - if (_file_to_saveload.ftype.abstract == FT_SCENARIO) { + if (_file_to_saveload.ftype.abstract == AbstractFileType::Scenario) { OnStartScenario(); } OnStartGame(_network_dedicated); diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 67392006dc..cd36bc2a9f 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -258,7 +258,7 @@ static void InitializeWindowsAndCaches() /* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it * accordingly if it is not the case. No need to set it on companies that are not been used already, * thus the MIN_YEAR (which is really nothing more than Zero, initialized value) test */ - if (_file_to_saveload.ftype.abstract == FT_SCENARIO && c->inaugurated_year != EconomyTime::MIN_YEAR) { + if (_file_to_saveload.ftype.abstract == AbstractFileType::Scenario && c->inaugurated_year != EconomyTime::MIN_YEAR) { c->inaugurated_year = TimerGameEconomy::year; } } diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 54ad666fe5..9114cc118e 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -3455,7 +3455,7 @@ std::string GenerateDefaultSaveName() */ void FileToSaveLoad::SetMode(const FiosType &ft, SaveLoadOperation fop) { - if (ft.abstract == FT_INVALID || ft.abstract == FT_NONE) { + if (ft.abstract == AbstractFileType::Invalid || ft.abstract == AbstractFileType::None) { this->file_op = SLO_INVALID; this->ftype = FIOS_TYPE_INVALID; return; diff --git a/src/saveload/signs_sl.cpp b/src/saveload/signs_sl.cpp index 83cb833049..5b22eebe5d 100644 --- a/src/saveload/signs_sl.cpp +++ b/src/saveload/signs_sl.cpp @@ -63,7 +63,7 @@ struct SIGNChunkHandler : ChunkHandler { } /* Signs placed in scenario editor shall now be OWNER_DEITY */ - if (IsSavegameVersionBefore(SLV_171) && si->owner == OWNER_NONE && _file_to_saveload.ftype.abstract == FT_SCENARIO) { + if (IsSavegameVersionBefore(SLV_171) && si->owner == OWNER_NONE && _file_to_saveload.ftype.abstract == AbstractFileType::Scenario) { si->owner = OWNER_DEITY; } } diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index b18a677e0c..adeaef234d 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -405,17 +405,17 @@ static CallBackFunction MenuClickSaveLoad(int index = 0) { if (_game_mode == GM_EDITOR) { switch (SaveLoadEditorMenuEntries(index)) { - case SaveLoadEditorMenuEntries::SaveScenario: ShowSaveLoadDialog(FT_SCENARIO, SLO_SAVE); break; - case SaveLoadEditorMenuEntries::LoadScenario: ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD); break; - case SaveLoadEditorMenuEntries::SaveHeightmap: ShowSaveLoadDialog(FT_HEIGHTMAP, SLO_SAVE); break; - case SaveLoadEditorMenuEntries::LoadHeightmap: ShowSaveLoadDialog(FT_HEIGHTMAP, SLO_LOAD); break; + case SaveLoadEditorMenuEntries::SaveScenario: ShowSaveLoadDialog(AbstractFileType::Scenario, SLO_SAVE); break; + case SaveLoadEditorMenuEntries::LoadScenario: ShowSaveLoadDialog(AbstractFileType::Scenario, SLO_LOAD); break; + case SaveLoadEditorMenuEntries::SaveHeightmap: ShowSaveLoadDialog(AbstractFileType::Heightmap, SLO_SAVE); break; + case SaveLoadEditorMenuEntries::LoadHeightmap: ShowSaveLoadDialog(AbstractFileType::Heightmap, SLO_LOAD); break; case SaveLoadEditorMenuEntries::ExitToMainMenu: AskExitToGameMenu(); break; case SaveLoadEditorMenuEntries::ExitGame: HandleExitGameRequest(); break; } } else { switch (SaveLoadNormalMenuEntries(index)) { - case SaveLoadNormalMenuEntries::SaveGame: ShowSaveLoadDialog(FT_SAVEGAME, SLO_SAVE); break; - case SaveLoadNormalMenuEntries::LoadGame: ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); break; + case SaveLoadNormalMenuEntries::SaveGame: ShowSaveLoadDialog(AbstractFileType::Savegame, SLO_SAVE); break; + case SaveLoadNormalMenuEntries::LoadGame: ShowSaveLoadDialog(AbstractFileType::Savegame, SLO_LOAD); break; case SaveLoadNormalMenuEntries::ExitToMainMenu: AskExitToGameMenu(); break; case SaveLoadNormalMenuEntries::ExitGame: HandleExitGameRequest(); break; } @@ -2047,7 +2047,7 @@ struct MainToolbarWindow : Window { case MTHK_FASTFORWARD: ToolbarFastForwardClick(this); break; case MTHK_SETTINGS: ShowGameOptions(); break; case MTHK_SAVEGAME: MenuClickSaveLoad(); break; - case MTHK_LOADGAME: ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); break; + case MTHK_LOADGAME: ShowSaveLoadDialog(AbstractFileType::Savegame, SLO_LOAD); break; case MTHK_SMALLMAP: ShowSmallMap(); break; case MTHK_TOWNDIRECTORY: ShowTownDirectory(); break; case MTHK_SUBSIDIES: ShowSubsidiesList(); break; diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 5492bb76d2..dcf45fb4ae 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -1261,7 +1261,7 @@ public: break; } case WID_TF_LOAD_FROM_FILE: - ShowSaveLoadDialog(FT_TOWN_DATA, SLO_LOAD); + ShowSaveLoadDialog(AbstractFileType::TownData, SLO_LOAD); break; case WID_TF_EXPAND_ALL_TOWNS: