diff --git a/src/localisation/LanguagePack.h b/src/localisation/LanguagePack.h index 2c83a0dd08..ba4701f2f8 100644 --- a/src/localisation/LanguagePack.h +++ b/src/localisation/LanguagePack.h @@ -18,6 +18,26 @@ #include "../common.h" +enum +{ + RCT2_LANGUAGE_ID_ENGLISH_UK, + RCT2_LANGUAGE_ID_ENGLISH_US, + RCT2_LANGUAGE_ID_FRENCH, + RCT2_LANGUAGE_ID_GERMAN, + RCT2_LANGUAGE_ID_SPANISH, + RCT2_LANGUAGE_ID_ITALIAN, + RCT2_LANGUAGE_ID_DUTCH, + RCT2_LANGUAGE_ID_SWEDISH, + RCT2_LANGUAGE_ID_8, + RCT2_LANGUAGE_ID_KOREAN, + RCT2_LANGUAGE_ID_CHINESE_SIMPLIFIED, + RCT2_LANGUAGE_ID_CHINESE_TRADITIONAL, + RCT2_LANGUAGE_ID_12, + RCT2_LANGUAGE_ID_PORTUGUESE, + RCT2_LANGUAGE_ID_BLANK = 254, + RCT2_LANGUAGE_ID_END = 255 +}; + interface ILanguagePack { virtual ~ILanguagePack() = default; diff --git a/src/localisation/language.cpp b/src/localisation/language.cpp index 9f5bddf07c..09e035259f 100644 --- a/src/localisation/language.cpp +++ b/src/localisation/language.cpp @@ -32,25 +32,6 @@ extern "C" { #include "../util/util.h" #include "localisation.h" -enum -{ - RCT2_LANGUAGE_ID_ENGLISH_UK, - RCT2_LANGUAGE_ID_ENGLISH_US, - RCT2_LANGUAGE_ID_FRENCH, - RCT2_LANGUAGE_ID_GERMAN, - RCT2_LANGUAGE_ID_SPANISH, - RCT2_LANGUAGE_ID_ITALIAN, - RCT2_LANGUAGE_ID_DUTCH, - RCT2_LANGUAGE_ID_SWEDISH, - RCT2_LANGUAGE_ID_8, - RCT2_LANGUAGE_ID_KOREAN, - RCT2_LANGUAGE_ID_CHINESE_SIMPLIFIED, - RCT2_LANGUAGE_ID_CHINESE_TRADITIONAL, - RCT2_LANGUAGE_ID_12, - RCT2_LANGUAGE_ID_PORTUGUESE, - RCT2_LANGUAGE_ID_END = 255 -}; - static TTFFontSetDescriptor TTFFontMSGothic = {{ { "msgothic.ttc", "MS PGothic", 9, 1, 0, 15, nullptr }, diff --git a/src/object/StringTable.cpp b/src/object/StringTable.cpp index 44b5cc50df..44123f1f83 100644 --- a/src/object/StringTable.cpp +++ b/src/object/StringTable.cpp @@ -26,10 +26,6 @@ extern "C" #include "../localisation/localisation.h" } -constexpr uint8 RCT2_LANGUAGE_ID_ENGLISH_UK = 0; -constexpr uint8 RCT2_LANGUAGE_ID_BLANK = 254; -constexpr uint8 RCT2_LANGUAGE_ID_END = 255; - static bool StringIsBlank(utf8 * str) { for (utf8 * ch = str; *ch != '\0'; ch++)