Split colour and translucent flag in theme JSON

OpenRCT2 · May 18, 2024 · 57d1b15 · 57d1b15
1 parent be9509e
commit 57d1b15
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp
@@ -296,15 +296,19 @@ json_t UIThemeWindowEntry::ToJson() const
     json_t jsonColours = json_t::array();
     for (uint8_t i = 0; i < wtDesc->NumColours; i++)
     {
-        auto colour = Theme.Colours[i].toUint16();
-        jsonColours.emplace_back(colour);
+        json_t jsonEntry = {
+            { "colour", Theme.Colours[i].colour },
+            { "translucent", Theme.Colours[i].hasFlag(ColourFlag::translucent)}
+        };
+
+        jsonColours.emplace_back(jsonEntry);
     }
 
-    json_t jsonEntry = {
+    json_t colourSettingsEntry = {
         { "colours", jsonColours },
     };
 
-    return jsonEntry;
+    return colourSettingsEntry;
 }
 
 UIThemeWindowEntry UIThemeWindowEntry::FromJson(const WindowThemeDesc* wtDesc, json_t& jsonData, uint8_t version)
@@ -327,11 +331,20 @@ UIThemeWindowEntry UIThemeWindowEntry::FromJson(const WindowThemeDesc* wtDesc, j
 
     for (size_t i = 0; i < colourCount; i++)
     {
-        auto number = Json::GetNumber<uint16_t>(jsonColours[i]);
         if (version == 0)
+        {
+            auto number = Json::GetNumber<uint8_t>(jsonColours[i]);
             result.Theme.Colours[i] = ColourWithFlags::fromLegacy(number);
+        }
         else
-            result.Theme.Colours[i] = ColourWithFlags::fromUint16(number);
+        {
+            auto colourObject = Json::AsObject(jsonColours[i]);
+            auto colour = Json::GetNumber<uint8_t>(colourObject["colour"]);
+            auto isTranslucent = Json::GetBoolean(colourObject["translucent"], false);
+            uint8_t flags = isTranslucent ? EnumToFlag(ColourFlag::translucent) : 0;
+
+            result.Theme.Colours[i] = { colour, flags };
+        }
     }
 
     return result;