From 463cb7ab266e8c99c34e745ddbae1084be1b038c Mon Sep 17 00:00:00 2001
From: xp4xbox <nicman1080@gmail.com>
Date: Tue, 9 May 2017 21:19:37 -0400
Subject: [PATCH] Fix #5339: Change scenery eyedropper to use a relevant icon.

---
 resources/g2/icons/eyedropper.png   | Bin 0 -> 3755 bytes
 resources/g2/sprites.json           |   5 +++++
 src/openrct2-ui/windows/Scenery.cpp |   4 ++--
 src/openrct2/sprites.h              |   2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 resources/g2/icons/eyedropper.png

diff --git a/resources/g2/icons/eyedropper.png b/resources/g2/icons/eyedropper.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c060e9d3d29c776b8a18c9ee2601f5bcae6af39
GIT binary patch
literal 3755
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
L__^1(g`fW)*DYo8

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index 9983913207..4aa9db09d1 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -434,5 +434,10 @@
         "path": "edge/skyscraper_b.png",
         "x_offset": 2,
         "y_offset": 2
+    },
+    {
+        "path": "icons/eyedropper.png",
+        "x_offset": 5,
+        "y_offset": 5
     }
 ]
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index f5d7d2eeb6..f596ea6783 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -175,7 +175,7 @@ static rct_widget window_scenery_widgets[] = {
     { WWT_COLOURBTN, 1, 615, 626, 93, 104, 0xFFFFFFFF, STR_SELECT_COLOUR },             // 8000000          0x009DE448
     { WWT_COLOURBTN, 1, 615, 626, 105, 116, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR },  // 10000000         0x009DE458
     { WWT_COLOURBTN, 1, 615, 626, 117, 128, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR },        // 20000000         0x009DE468
-    { WWT_FLATBTN, 1, 609, 632, 130, 153, SPR_PICKUP_BTN, STR_SCENERY_EYEDROPPER_TIP },                                 // 40000000         0x009DE478
+    { WWT_FLATBTN, 1, 609, 632, 130, 153, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP },                                 // 40000000         0x009DE478
     { WWT_FLATBTN, 1, 609, 632, 154, 177, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP },                                   // 40000000         0x009DE478
     { WIDGETS_END },
 };
@@ -772,7 +772,7 @@ static void window_scenery_update(rct_window *w)
     }
 
     if (gWindowSceneryEyedropperEnabled) {
-        gCurrentToolId = TOOL_PICKER;
+        gCurrentToolId = TOOL_CROSSHAIR;
     } else if (gWindowSceneryPaintEnabled == 1) { // the repaint scenery tool is active
         gCurrentToolId = TOOL_PAINT_DOWN;
     } else {
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index e5b64c2730..462ff6799b 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -842,6 +842,8 @@ enum {
     SPR_G2_WALL_TEXTURE_STONE_GREY = SPR_G2_BEGIN + 120,
     SPR_G2_WALL_TEXTURE_SKYSCRAPER_A = SPR_G2_BEGIN + 121,
     SPR_G2_WALL_TEXTURE_SKYSCRAPER_B = SPR_G2_BEGIN + 122,
+    
+    SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 123,
 
     // 0x60000, chosen because it's a round hex number
     // of the last possible range of image ID values that is large enough to fit all csg1 sprites.