From f12eb3010fbe8038ceff31cc5543999ec97de9a4 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 1 Sep 2019 11:12:09 +0200 Subject: [PATCH] Fix display of G2 characters; remove some unused sprite IDs --- .../paint/tile_element/Paint.Surface.h | 19 ------------------- src/openrct2/sprites.h | 12 ++---------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/openrct2/paint/tile_element/Paint.Surface.h b/src/openrct2/paint/tile_element/Paint.Surface.h index 4bf1a891f1..84332c0cd8 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.h +++ b/src/openrct2/paint/tile_element/Paint.Surface.h @@ -100,25 +100,6 @@ enum SPR_TERRAIN_PATTERN_MARTIAN = 28995, SPR_TERRAIN_PATTERN_GRASS_CLUMPS = 29001, SPR_TERRAIN_PATTERN_ICE = 29007, - - SPR_CSG_TERRAIN_GRASS = SPR_CSG_BEGIN + 41862, - SPR_CSG_TERRAIN_GRASS_GRID = SPR_CSG_TERRAIN_GRASS + 19, - SPR_CSG_TERRAIN_GRASS_UNDERGROUND = SPR_CSG_TERRAIN_GRASS + 38, - SPR_CSG_TERRAIN_SAND = SPR_CSG_BEGIN + 41919, - SPR_CSG_TERRAIN_ICE = SPR_CSG_BEGIN + 41976, - SPR_CSG_TERRAIN_GRASS_CLUMPS = SPR_CSG_BEGIN + 42033, - SPR_CSG_TERRAIN_ROOF_TILES_RED = SPR_CSG_BEGIN + 42090, - SPR_CSG_TERRAIN_ROOF_TILES_GREY = SPR_CSG_BEGIN + 42147, - SPR_CSG_TERRAIN_GRID = SPR_CSG_BEGIN + 42204, - SPR_CSG_TERRAIN_WOOD = SPR_CSG_BEGIN + 42261, - SPR_CSG_TERRAIN_WOOD_INVERTED = SPR_CSG_BEGIN + 42318, - SPR_CSG_TERRAIN_RUST = SPR_CSG_BEGIN + 42375, - SPR_CSG_TERRAIN_RUST_INVERTED = SPR_CSG_BEGIN + 42432, - SPR_CSG_TERRAIN_MARTIAN = SPR_CSG_BEGIN + 42489, - SPR_CSG_TERRAIN_CHECKERBOARD = SPR_CSG_BEGIN + 42546, - SPR_CSG_TERRAIN_CHECKERBOARD_INVERTED = SPR_CSG_BEGIN + 42603, - SPR_CSG_TERRAIN_DIRT = SPR_CSG_BEGIN + 42660, - SPR_CSG_TERRAIN_ROCK = SPR_CSG_BEGIN + 42717, }; #endif //_PAINT_SURFACE_H diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 71780a140b..25fa8f8fc8 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -954,19 +954,11 @@ enum SPR_G2_Z_CARON_LOWER = SPR_G2_CHAR_BEGIN + 85, SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 86, - SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, - SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, + SPR_G2_GLYPH_COUNT = (SPR_G2_ROUBLE_SIGN - SPR_G2_CHAR_BEGIN) + 1, + SPR_G2_CHAR_END = SPR_G2_CHAR_BEGIN + SPR_G2_GLYPH_COUNT * 3, SPR_G2_END = SPR_G2_CHAR_END, SPR_CSG_BEGIN = SPR_G2_END, - - SPR_CSG_ICE_CREAM_STALL_BEGIN = SPR_CSG_BEGIN + 60625, - SPR_CSG_TOILETS_BEGIN = SPR_CSG_BEGIN + 61289, - - SPR_CSG_RIDE_PREVIEWS_BEGIN = SPR_CSG_BEGIN + 64195, - SPR_CSG_RIDE_PREVIEW_ICE_CREAM_STALL = SPR_CSG_RIDE_PREVIEWS_BEGIN + RCT1_RIDE_TYPE_ICE_CREAM_STALL, - SPR_CSG_RIDE_PREVIEW_TOILETS = SPR_CSG_RIDE_PREVIEWS_BEGIN + RCT1_RIDE_TYPE_TOILETS, - SPR_CSG_END = SPR_CSG_BEGIN + 69917, SPR_IMAGE_LIST_BEGIN = SPR_CSG_END,