Refactor ObjectJsonHelpers

Move functions in ObjectJsonHelpers to their relevant namespaces and classes
- Move ParseColour to Colour::FromString
- Move ParseCursor to Cursor::FromString
- Move LoadStrings to StringTable::ReadJson
- Move LoadImages to ImageTable::ReadJson
- Move ParseObjectEntry to Object::ParseObjectEntry
- Move GetString, etc. to Json::GetString, etc.
- Delete ObjectJsonHelpers .cpp and .h files

src/openrct2/interface/Colour.cpp

@@ -57,6 +57,49 @@ void colours_init_maps()
     }
 }
 
+namespace Colour
+{
+    colour_t FromString(const std::string_view& s, colour_t defaultValue)
+    {
+        static const std::unordered_map<std::string_view, colour_t> LookupTable{
+            { "black", COLOUR_BLACK },
+            { "grey", COLOUR_GREY },
+            { "white", COLOUR_WHITE },
+            { "dark_purple", COLOUR_DARK_PURPLE },
+            { "light_purple", COLOUR_LIGHT_PURPLE },
+            { "bright_purple", COLOUR_BRIGHT_PURPLE },
+            { "dark_blue", COLOUR_DARK_BLUE },
+            { "light_blue", COLOUR_LIGHT_BLUE },
+            { "icy_blue", COLOUR_ICY_BLUE },
+            { "teal", COLOUR_TEAL },
+            { "aquamarine", COLOUR_AQUAMARINE },
+            { "saturated_green", COLOUR_SATURATED_GREEN },
+            { "dark_green", COLOUR_DARK_GREEN },
+            { "moss_green", COLOUR_MOSS_GREEN },
+            { "bright_green", COLOUR_BRIGHT_GREEN },
+            { "olive_green", COLOUR_OLIVE_GREEN },
+            { "dark_olive_green", COLOUR_DARK_OLIVE_GREEN },
+            { "bright_yellow", COLOUR_BRIGHT_YELLOW },
+            { "yellow", COLOUR_YELLOW },
+            { "dark_yellow", COLOUR_DARK_YELLOW },
+            { "light_orange", COLOUR_LIGHT_ORANGE },
+            { "dark_orange", COLOUR_DARK_ORANGE },
+            { "light_brown", COLOUR_LIGHT_BROWN },
+            { "saturated_brown", COLOUR_SATURATED_BROWN },
+            { "dark_brown", COLOUR_DARK_BROWN },
+            { "salmon_pink", COLOUR_SALMON_PINK },
+            { "bordeaux_red", COLOUR_BORDEAUX_RED },
+            { "saturated_red", COLOUR_SATURATED_RED },
+            { "bright_red", COLOUR_BRIGHT_RED },
+            { "dark_pink", COLOUR_DARK_PINK },
+            { "bright_pink", COLOUR_BRIGHT_PINK },
+            { "light_pink", COLOUR_LIGHT_PINK },
+        };
+        auto result = LookupTable.find(s);
+        return (result != LookupTable.end()) ? result->second : defaultValue;
+    }
+} // namespace Colour
+
 #ifndef NO_TTF
 static uint8_t BlendColourMap[PALETTE_COUNT][PALETTE_COUNT] = { 0 };
 

src/openrct2/interface/Colour.h

@@ -12,6 +12,8 @@
 
 #include "../common.h"
 
+#include <string_view>
+
 /**
  * Colour IDs as used by the colour dropdown, NOT palette indices.
  */
@@ -207,6 +209,11 @@ extern rct_colour_map ColourMapA[COLOUR_COUNT];
 
 void colours_init_maps();
 
+namespace Colour
+{
+    colour_t FromString(const std::string_view& s, colour_t defaultValue = COLOUR_BLACK);
+}
+
 #ifndef NO_TTF
 uint8_t blendColours(const uint8_t paletteIndex1, const uint8_t paletteIndex2);
 #endif

src/openrct2/interface/Cursors.cpp

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2020 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#include "Cursors.h"
+
+#include <string>
+#include <unordered_map>
+
+namespace Cursor
+{
+    uint8_t FromString(const std::string& s, uint8_t defaultValue)
+    {
+        static const std::unordered_map<std::string, uint8_t> LookupTable{
+            { "CURSOR_BLANK", CURSOR_BLANK },
+            { "CURSOR_UP_ARROW", CURSOR_UP_ARROW },
+            { "CURSOR_UP_DOWN_ARROW", CURSOR_UP_DOWN_ARROW },
+            { "CURSOR_HAND_POINT", CURSOR_HAND_POINT },
+            { "CURSOR_ZZZ", CURSOR_ZZZ },
+            { "CURSOR_DIAGONAL_ARROWS", CURSOR_DIAGONAL_ARROWS },
+            { "CURSOR_PICKER", CURSOR_PICKER },
+            { "CURSOR_TREE_DOWN", CURSOR_TREE_DOWN },
+            { "CURSOR_FOUNTAIN_DOWN", CURSOR_FOUNTAIN_DOWN },
+            { "CURSOR_STATUE_DOWN", CURSOR_STATUE_DOWN },
+            { "CURSOR_BENCH_DOWN", CURSOR_BENCH_DOWN },
+            { "CURSOR_CROSS_HAIR", CURSOR_CROSS_HAIR },
+            { "CURSOR_BIN_DOWN", CURSOR_BIN_DOWN },
+            { "CURSOR_LAMPPOST_DOWN", CURSOR_LAMPPOST_DOWN },
+            { "CURSOR_FENCE_DOWN", CURSOR_FENCE_DOWN },
+            { "CURSOR_FLOWER_DOWN", CURSOR_FLOWER_DOWN },
+            { "CURSOR_PATH_DOWN", CURSOR_PATH_DOWN },
+            { "CURSOR_DIG_DOWN", CURSOR_DIG_DOWN },
+            { "CURSOR_WATER_DOWN", CURSOR_WATER_DOWN },
+            { "CURSOR_HOUSE_DOWN", CURSOR_HOUSE_DOWN },
+            { "CURSOR_VOLCANO_DOWN", CURSOR_VOLCANO_DOWN },
+            { "CURSOR_WALK_DOWN", CURSOR_WALK_DOWN },
+            { "CURSOR_PAINT_DOWN", CURSOR_PAINT_DOWN },
+            { "CURSOR_ENTRANCE_DOWN", CURSOR_ENTRANCE_DOWN },
+            { "CURSOR_HAND_OPEN", CURSOR_HAND_OPEN },
+            { "CURSOR_HAND_CLOSED", CURSOR_HAND_CLOSED },
+            { "CURSOR_ARROW", CURSOR_ARROW },
+        };
+
+        auto result = LookupTable.find(s);
+        return (result != LookupTable.end()) ? result->second : defaultValue;
+    }
+} // namespace Cursor

src/openrct2/interface/Cursors.h

@@ -44,6 +44,11 @@ enum CURSOR_ID
     CURSOR_COUNT,
 };
 
+namespace Cursor
+{
+    uint8_t FromString(const std::string& s, uint8_t defaultValue);
+}
+
 namespace OpenRCT2::Ui
 {
     constexpr size_t CURSOR_BIT_WIDTH = 32;