diff --git a/resources/g2/edge/brick.png b/resources/g2/edge/brick.png new file mode 100644 index 0000000000..33fafac33c Binary files /dev/null and b/resources/g2/edge/brick.png differ diff --git a/resources/g2/edge/brown_sandstone.png b/resources/g2/edge/brown_sandstone.png new file mode 100644 index 0000000000..202475cd70 Binary files /dev/null and b/resources/g2/edge/brown_sandstone.png differ diff --git a/resources/g2/edge/green_stucco.png b/resources/g2/edge/green_stucco.png new file mode 100644 index 0000000000..08b966fd34 Binary files /dev/null and b/resources/g2/edge/green_stucco.png differ diff --git a/resources/g2/edge/grey_sandstone.png b/resources/g2/edge/grey_sandstone.png new file mode 100644 index 0000000000..df4a2bb9c9 Binary files /dev/null and b/resources/g2/edge/grey_sandstone.png differ diff --git a/resources/g2/edge/purple_stucco.png b/resources/g2/edge/purple_stucco.png new file mode 100644 index 0000000000..f8ecde9530 Binary files /dev/null and b/resources/g2/edge/purple_stucco.png differ diff --git a/resources/g2/edge/red_stucco.png b/resources/g2/edge/red_stucco.png new file mode 100644 index 0000000000..c2f24b8f2f Binary files /dev/null and b/resources/g2/edge/red_stucco.png differ diff --git a/resources/g2/edge/rust.png b/resources/g2/edge/rust.png new file mode 100644 index 0000000000..5381391c17 Binary files /dev/null and b/resources/g2/edge/rust.png differ diff --git a/resources/g2/edge/skyscraper_a.png b/resources/g2/edge/skyscraper_a.png new file mode 100644 index 0000000000..a23b9154c4 Binary files /dev/null and b/resources/g2/edge/skyscraper_a.png differ diff --git a/resources/g2/edge/skyscraper_b.png b/resources/g2/edge/skyscraper_b.png new file mode 100644 index 0000000000..1204f9f6d6 Binary files /dev/null and b/resources/g2/edge/skyscraper_b.png differ diff --git a/resources/g2/edge/white_stucco.png b/resources/g2/edge/white_stucco.png new file mode 100644 index 0000000000..a7784d4be7 Binary files /dev/null and b/resources/g2/edge/white_stucco.png differ diff --git a/resources/g2/edge/yellow_stucco.png b/resources/g2/edge/yellow_stucco.png new file mode 100644 index 0000000000..5309fc68cc Binary files /dev/null and b/resources/g2/edge/yellow_stucco.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 26588a6d9c..9983913207 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -379,5 +379,60 @@ "path": "surface/selection_edge_se.png", "x_offset": 0, "y_offset": 15 + }, + { + "path": "edge/brick.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/rust.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/white_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/yellow_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/red_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/purple_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/green_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/brown_sandstone.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/grey_sandstone.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/skyscraper_a.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/skyscraper_b.png", + "x_offset": 2, + "y_offset": 2 } ] diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index b072233f64..76770f749a 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -56,17 +56,17 @@ uint32 WallTexturePreviews[] = SPR_WALL_TEXTURE_WOOD_RED, SPR_WALL_TEXTURE_WOOD_BLACK, SPR_WALL_TEXTURE_ICE, - SPR_CSG_WALL_TEXTURE_BRICK, - SPR_CSG_WALL_TEXTURE_IRON, - SPR_CSG_WALL_TEXTURE_GREY, - SPR_CSG_WALL_TEXTURE_YELLOW, - SPR_CSG_WALL_TEXTURE_RED, - SPR_CSG_WALL_TEXTURE_PURPLE, - SPR_CSG_WALL_TEXTURE_GREEN, - SPR_CSG_WALL_TEXTURE_STONE_BROWN, - SPR_CSG_WALL_TEXTURE_STONE_GREY, - SPR_CSG_WALL_TEXTURE_SKYSCRAPER_A, - SPR_CSG_WALL_TEXTURE_SKYSCRAPER_B, + SPR_G2_WALL_TEXTURE_BRICK, + SPR_G2_WALL_TEXTURE_IRON, + SPR_G2_WALL_TEXTURE_GREY, + SPR_G2_WALL_TEXTURE_YELLOW, + SPR_G2_WALL_TEXTURE_RED, + SPR_G2_WALL_TEXTURE_PURPLE, + SPR_G2_WALL_TEXTURE_GREEN, + SPR_G2_WALL_TEXTURE_STONE_BROWN, + SPR_G2_WALL_TEXTURE_STONE_GREY, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_A, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_B, }; uint16 gLandToolSize; @@ -119,9 +119,8 @@ void land_tool_show_surface_style_dropdown(rct_window * w, rct_widget * widget, void land_tool_show_edge_style_dropdown(rct_window * w, rct_widget * widget, uint8 currentEdgeType) { uint8 defaultIndex = 0; - const uint8 edgeCount = input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z) && is_csg_loaded() ? - TERRAIN_EDGE_COUNT : - TERRAIN_EDGE_RCT2_COUNT; + // Do not show RCT1 edge styles if the player does not have RCT1. + const uint8 edgeCount = is_csg_loaded() ? TERRAIN_EDGE_COUNT : TERRAIN_EDGE_RCT2_COUNT; for (uint8 i = 0; i < edgeCount; i++) { gDropdownItemsFormat[i] = DROPDOWN_FORMAT_LAND_PICKER; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index f8956cb6b0..e5b64c2730 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -831,6 +831,18 @@ enum { SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 110, SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 111, + SPR_G2_WALL_TEXTURE_BRICK = SPR_G2_BEGIN + 112, + SPR_G2_WALL_TEXTURE_IRON = SPR_G2_BEGIN + 113, + SPR_G2_WALL_TEXTURE_GREY = SPR_G2_BEGIN + 114, + SPR_G2_WALL_TEXTURE_YELLOW = SPR_G2_BEGIN + 115, + SPR_G2_WALL_TEXTURE_RED = SPR_G2_BEGIN + 116, + SPR_G2_WALL_TEXTURE_PURPLE = SPR_G2_BEGIN + 117, + SPR_G2_WALL_TEXTURE_GREEN = SPR_G2_BEGIN + 118, + SPR_G2_WALL_TEXTURE_STONE_BROWN = SPR_G2_BEGIN + 119, + 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, + // 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. SPR_CSG_BEGIN = 393216,