From de2b893d99e4d2e99af98a666cff952f4fcb7630 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sat, 1 Jan 2022 16:52:49 +0100
Subject: [PATCH] Fix #16061: Incorrect colours in minimap

---
 src/openrct2-ui/windows/Map.cpp              | 24 ++++++--------------
 src/openrct2/object/TerrainSurfaceObject.cpp | 10 ++++++++
 src/openrct2/object/TerrainSurfaceObject.h   |  1 +
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index b344a4c333..40edfaff83 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -29,6 +29,7 @@
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Formatter.h>
 #include <openrct2/localisation/Localisation.h>
+#include <openrct2/object/TerrainSurfaceObject.h>
 #include <openrct2/ride/RideData.h>
 #include <openrct2/ride/Track.h>
 #include <openrct2/ride/TrainManager.h>
@@ -1380,22 +1381,6 @@ static void MapWindowDecreaseMapSize()
 }
 
 static constexpr const uint16_t WaterColour = MapColour(PALETTE_INDEX_195);
-static constexpr const uint16_t TerrainColour[] = {
-    MapColour(PALETTE_INDEX_73),                     // TERRAIN_GRASS
-    MapColour(PALETTE_INDEX_40),                     // TERRAIN_SAND
-    MapColour(PALETTE_INDEX_108),                    // TERRAIN_DIRT
-    MapColour(PALETTE_INDEX_12),                     // TERRAIN_ROCK
-    MapColour(PALETTE_INDEX_62),                     // TERRAIN_MARTIAN
-    MapColour2(PALETTE_INDEX_10, PALETTE_INDEX_16),  // TERRAIN_CHECKERBOARD
-    MapColour2(PALETTE_INDEX_73, PALETTE_INDEX_108), // TERRAIN_GRASS_CLUMPS
-    MapColour(PALETTE_INDEX_141),                    // TERRAIN_ICE
-    MapColour2(PALETTE_INDEX_172, PALETTE_INDEX_10), // TERRAIN_GRID_RED
-    MapColour2(PALETTE_INDEX_54, PALETTE_INDEX_10),  // TERRAIN_GRID_YELLOW
-    MapColour2(PALETTE_INDEX_162, PALETTE_INDEX_10), // TERRAIN_GRID_BLUE
-    MapColour2(PALETTE_INDEX_102, PALETTE_INDEX_10), // TERRAIN_GRID_GREEN
-    MapColour(PALETTE_INDEX_111),                    // TERRAIN_SAND_DARK
-    MapColour(PALETTE_INDEX_222),                    // TERRAIN_SAND_LIGHT
-};
 
 static constexpr const uint16_t ElementTypeMaskColour[] = {
     0xFFFF, // TILE_ELEMENT_TYPE_SURFACE
@@ -1424,7 +1409,12 @@ static uint16_t MapWindowGetPixelColourPeep(const CoordsXY& c)
     auto* surfaceElement = map_get_surface_element_at(c);
     if (surfaceElement == nullptr)
         return 0;
-    uint16_t colour = TerrainColour[surfaceElement->GetSurfaceStyle()];
+
+    uint16_t colour = MapColour(PALETTE_INDEX_0);
+    const auto* surfaceObject = surfaceElement->GetSurfaceStyleObject();
+    if (surfaceObject != nullptr)
+        colour = MapColour2(surfaceObject->MapColours[0], surfaceObject->MapColours[1]);
+
     if (surfaceElement->GetWaterHeight() > 0)
         colour = WaterColour;
 
diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp
index 05c7f433bd..7adf3629d7 100644
--- a/src/openrct2/object/TerrainSurfaceObject.cpp
+++ b/src/openrct2/object/TerrainSurfaceObject.cpp
@@ -94,6 +94,16 @@ void TerrainSurfaceObject::ReadJson(IReadObjectContext* context, json_t& root)
               { "smoothWithOther", TERRAIN_SURFACE_FLAGS::SMOOTH_WITH_OTHER },
               { "canGrow", TERRAIN_SURFACE_FLAGS::CAN_GROW } });
 
+        const auto mapColours = properties["mapColours"];
+        const bool mapColoursAreValid = mapColours.is_array() && mapColours.size() == std::size(MapColours);
+        for (size_t i = 0; i < std::size(MapColours); i++)
+        {
+            if (mapColoursAreValid)
+                MapColours[i] = mapColours[i];
+            else
+                MapColours[i] = PALETTE_INDEX_0;
+        }
+
         for (auto& el : properties["special"])
         {
             if (el.is_object())
diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h
index 60ed875d6b..0cbce2d7ba 100644
--- a/src/openrct2/object/TerrainSurfaceObject.h
+++ b/src/openrct2/object/TerrainSurfaceObject.h
@@ -53,6 +53,7 @@ public:
     uint8_t Rotations{};
     money32 Price{};
     TERRAIN_SURFACE_FLAGS Flags{};
+    uint8_t MapColours[2];
 
     void ReadJson(IReadObjectContext* context, json_t& root) override;
     void Load() override;