From 936ec799fa78fdf50ea574b3f9afd26337b24c90 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 20 Jan 2017 13:40:06 +0100 Subject: [PATCH] Add constants for CSG1 large surface sprites --- src/openrct2/paint/map_element/surface.c | 3 +-- src/openrct2/paint/map_element/surface.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/openrct2/paint/map_element/surface.c b/src/openrct2/paint/map_element/surface.c index eed18a058d..931703234a 100644 --- a/src/openrct2/paint/map_element/surface.c +++ b/src/openrct2/paint/map_element/surface.c @@ -1106,8 +1106,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) image_id = dword_97B750[ebp][showGridlines ? 1 : 0] + image_offset; if (gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { - // TODO: SPR_TERRAIN_TRACK_DESIGNER ??? - image_id = 2623; + image_id = SPR_TERRAIN_TRACK_DESIGNER; } if (gCurrentViewportFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE)) { diff --git a/src/openrct2/paint/map_element/surface.h b/src/openrct2/paint/map_element/surface.h index eb1b992854..1f9e1b3c98 100644 --- a/src/openrct2/paint/map_element/surface.h +++ b/src/openrct2/paint/map_element/surface.h @@ -18,6 +18,7 @@ #define _PAINT_SURFACE_H #include "../../common.h" +#include "../../sprites.h" #include "../../world/map.h" enum @@ -59,6 +60,7 @@ enum SPR_TERRAIN_ROCK_GRID = 2561, SPR_TERRAIN_ROCK_UNDERGROUND = 2580, SPR_TERRAIN_SELECTION_PATROL_AREA = 2599, + SPR_TERRAIN_TRACK_DESIGNER = 2623, SPR_TERRAIN_GRASS_MOWED = 2663, SPR_TERRAIN_GRASS_MOWED_GRID = 2682, SPR_TERRAIN_GRASS_MOWED_90 = 2701, @@ -98,6 +100,25 @@ 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