From 624d6ee752e9c95295c49b3b282effa84ac5f704 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 21 Aug 2022 23:44:35 +0200 Subject: [PATCH] Remove UnsupportedRCTCFlagException --- data/language/en-GB.txt | 1 - src/openrct2/Context.cpp | 14 -------------- src/openrct2/ParkImporter.h | 11 ----------- src/openrct2/localisation/StringIds.h | 2 -- 4 files changed, 28 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 69a8b73ebd..e0354628a9 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3304,7 +3304,6 @@ STR_6154 :For security reasons, it is not recommended to run OpenRCT2 with el STR_6155 :Neither KDialog nor Zenity are installed. Please install one, or configure from the command line. STR_6156 :Name is reserved STR_6157 :Console -STR_6158 :Failed to load this file…{NEWLINE}Incompatible RCTC version: {COMMA16} STR_6160 :{WINDOW_COLOUR_2}Available vehicles: {BLACK}{STRING} STR_6161 :Gridlines display toggle STR_6162 :Spinning Wild Mouse diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 19e492f26a..80a8f7b382 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -715,20 +715,6 @@ namespace OpenRCT2 auto windowManager = _uiContext->GetWindowManager(); windowManager->OpenIntent(&intent); } - catch (const UnsupportedRCTCFlagException& e) - { - Console::Error::WriteLine("Unable to open park: unsupported RCT classic feature"); - - // If loading the SV6 or SV4 failed return to the title screen if requested. - if (loadTitleScreenFirstOnFail) - { - title_load(); - } - auto windowManager = _uiContext->GetWindowManager(); - auto ft = Formatter(); - ft.Add(e.Flag); - windowManager->ShowError(STR_FAILED_TO_LOAD_IMCOMPATIBLE_RCTC_FLAG, STR_NONE, ft); - } catch (const UnsupportedRideTypeException&) { Console::Error::WriteLine("Unable to open park: unsupported ride types"); diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h index 031a4cf55d..146dd98124 100644 --- a/src/openrct2/ParkImporter.h +++ b/src/openrct2/ParkImporter.h @@ -83,17 +83,6 @@ public: } }; -class UnsupportedRCTCFlagException : public std::exception -{ -public: - uint8_t const Flag; - - explicit UnsupportedRCTCFlagException(uint8_t flag) - : Flag(flag) - { - } -}; - class UnsupportedRideTypeException : public std::exception { public: diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index b34413d542..3766ae76da 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3469,8 +3469,6 @@ enum : uint16_t STR_CONSOLE = 6157, - STR_FAILED_TO_LOAD_IMCOMPATIBLE_RCTC_FLAG = 6158, - STR_AVAILABLE_VEHICLES = 6160, STR_SHORTCUT_GRIDLINES_DISPLAY_TOGGLE = 6161,