diff --git a/resources/g2/icons/eyedropper.png b/resources/g2/icons/eyedropper.png new file mode 100644 index 0000000000..5c060e9d3d Binary files /dev/null and b/resources/g2/icons/eyedropper.png differ 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.