mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix #5339: Change scenery eyedropper to use a relevant icon.
This commit is contained in:
parent
f1ab13f56e
commit
463cb7ab26
Binary file not shown.
After Width: | Height: | Size: 3.7 KiB |
|
@ -434,5 +434,10 @@
|
||||||
"path": "edge/skyscraper_b.png",
|
"path": "edge/skyscraper_b.png",
|
||||||
"x_offset": 2,
|
"x_offset": 2,
|
||||||
"y_offset": 2
|
"y_offset": 2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "icons/eyedropper.png",
|
||||||
|
"x_offset": 5,
|
||||||
|
"y_offset": 5
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -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, 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, 105, 116, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR }, // 10000000 0x009DE458
|
||||||
{ WWT_COLOURBTN, 1, 615, 626, 117, 128, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR }, // 20000000 0x009DE468
|
{ 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
|
{ WWT_FLATBTN, 1, 609, 632, 154, 177, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP }, // 40000000 0x009DE478
|
||||||
{ WIDGETS_END },
|
{ WIDGETS_END },
|
||||||
};
|
};
|
||||||
|
@ -772,7 +772,7 @@ static void window_scenery_update(rct_window *w)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gWindowSceneryEyedropperEnabled) {
|
if (gWindowSceneryEyedropperEnabled) {
|
||||||
gCurrentToolId = TOOL_PICKER;
|
gCurrentToolId = TOOL_CROSSHAIR;
|
||||||
} else if (gWindowSceneryPaintEnabled == 1) { // the repaint scenery tool is active
|
} else if (gWindowSceneryPaintEnabled == 1) { // the repaint scenery tool is active
|
||||||
gCurrentToolId = TOOL_PAINT_DOWN;
|
gCurrentToolId = TOOL_PAINT_DOWN;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -842,6 +842,8 @@ enum {
|
||||||
SPR_G2_WALL_TEXTURE_STONE_GREY = SPR_G2_BEGIN + 120,
|
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_A = SPR_G2_BEGIN + 121,
|
||||||
SPR_G2_WALL_TEXTURE_SKYSCRAPER_B = SPR_G2_BEGIN + 122,
|
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
|
// 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.
|
// of the last possible range of image ID values that is large enough to fit all csg1 sprites.
|
||||||
|
|
Loading…
Reference in New Issue