Move config enums to more suitable places

src/openrct2/config.h

@@ -21,13 +21,6 @@
 #include "localisation/currency.h"
 #include "platform/platform.h"
 
-enum {
-	CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES = (1 << 0),
-	CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS = (1 << 1),
-	CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE = (1 << 2),
-	CONFIG_FLAG_SAVE_PLUGIN_DATA = (1 << 3)
-};
-
 enum {
 	SHORTCUT_CLOSE_TOP_MOST_WINDOW,
 	SHORTCUT_CLOSE_ALL_FLOATING_WINDOWS,
@@ -98,15 +91,10 @@ void config_release();
 bool config_open_default();
 bool config_save_default();
 
-uint16 getLanguage();
-
 void config_reset_shortcut_keys();
 bool config_shortcut_keys_load();
 bool config_shortcut_keys_save();
 
 bool config_find_or_browse_install_directory();
 
-void title_sequences_set_default();
-void title_sequences_load_presets();
-
 #endif

src/openrct2/config/Config.cpp

@@ -27,7 +27,9 @@
 extern "C"
 {
     #include "../localisation/currency.h"
+    #include "../localisation/date.h"
     #include "../localisation/language.h"
+    #include "../scenario/scenario.h"
 }
 
 namespace Config
@@ -72,10 +74,10 @@ namespace Config
 
     static auto Enum_DateFormat = ConfigEnum<sint32>(
     {
-        ConfigEnumEntry<sint32>("DD/MM/YY", DATE_FORMAT_DMY),
-        ConfigEnumEntry<sint32>("MM/DD/YY", DATE_FORMAT_MDY),
-        ConfigEnumEntry<sint32>("YY/MM/DD", DATE_FORMAT_YMD),
-        ConfigEnumEntry<sint32>("YY/DD/MM", DATE_FORMAT_YDM),
+        ConfigEnumEntry<sint32>("DD/MM/YY", DATE_FORMAT_DAY_MONTH_YEAR),
+        ConfigEnumEntry<sint32>("MM/DD/YY", DATE_FORMAT_MONTH_DAY_YEAR),
+        ConfigEnumEntry<sint32>("YY/MM/DD", DATE_FORMAT_YEAR_MONTH_DAY),
+        ConfigEnumEntry<sint32>("YY/DD/MM", DATE_FORMAT_YEAR_DAY_MONTH),
     });
 
     static auto Enum_DrawingEngine = ConfigEnum<sint32>(
@@ -156,7 +158,7 @@ namespace Config
             model->test_unfinished_tracks = reader->GetBoolean("test_unfinished_tracks", false);
 
             model->no_test_crashes = reader->GetBoolean("no_test_crashes", false);
-            model->date_format = reader->GetEnum<sint32>("date_format", DATE_FORMAT_DMY, Enum_DateFormat);
+            model->date_format = reader->GetEnum<sint32>("date_format", DATE_FORMAT_DAY_MONTH_YEAR, Enum_DateFormat);
             model->auto_staff_placement = reader->GetBoolean("auto_staff", true);
             model->handymen_mow_default = reader->GetBoolean("handymen_mow_default", false);
             model->default_inspection_interval = reader->GetSint32("default_inspection_interval", 2);

src/openrct2/config/Config.h

@@ -195,16 +195,6 @@ extern NetworkConfiguration         gConfigNetwork;
 extern NotificationConfiguration    gConfigNotifications;
 extern FontConfiguration            gConfigFonts;
 
-enum AUTOSAVE
-{
-    AUTOSAVE_EVERY_MINUTE,
-    AUTOSAVE_EVERY_5MINUTES,
-    AUTOSAVE_EVERY_15MINUTES,
-    AUTOSAVE_EVERY_30MINUTES,
-    AUTOSAVE_EVERY_HOUR,
-    AUTOSAVE_NEVER
-};
-
 enum SORT
 {
     SORT_NAME_ASCENDING,
@@ -213,12 +203,6 @@ enum SORT
     SORT_DATE_DESCENDING,
 };
 
-enum SCENARIO_SELECT_MODE
-{
-    SCENARIO_SELECT_MODE_DIFFICULTY,
-    SCENARIO_SELECT_MODE_ORIGIN,
-};
-
 enum TEMPERATURE_FORMAT
 {
     TEMPERATURE_FORMAT_C,
@@ -232,24 +216,6 @@ enum MEASUREMENT_FORMAT
     MEASUREMENT_FORMAT_SI
 };
 
-enum DATE_FORMAT
-{
-    DATE_FORMAT_DMY,
-    DATE_FORMAT_MDY,
-    DATE_FORMAT_YMD,
-    DATE_FORMAT_YDM
-};
-
-enum TITLE_SEQUENCE
-{
-    TITLE_SEQUENCE_RCT1,
-    TITLE_SEQUENCE_RCT1_AA,
-    TITLE_SEQUENCE_RCT1_AA_LL,
-    TITLE_SEQUENCE_RCT2,
-    TITLE_SEQUENCE_OPENRCT2,
-    TITLE_SEQUENCE_RANDOM
-};
-
 extern "C"
 {
     bool config_open(const utf8 * path);

src/openrct2/scenario/scenario.h

@@ -343,6 +343,20 @@ enum {
 	OBJECTIVE_MONTHLY_FOOD_INCOME
 };
 
+enum {
+	SCENARIO_SELECT_MODE_DIFFICULTY,
+	SCENARIO_SELECT_MODE_ORIGIN,
+};
+
+enum {
+	AUTOSAVE_EVERY_MINUTE,
+	AUTOSAVE_EVERY_5MINUTES,
+	AUTOSAVE_EVERY_15MINUTES,
+	AUTOSAVE_EVERY_30MINUTES,
+	AUTOSAVE_EVERY_HOUR,
+	AUTOSAVE_NEVER
+};
+
 #define AUTOSAVE_PAUSE 0
 
 extern const rct_string_id ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT];