From 5a5eea68373665b36df8158f52045097f09e6c0c Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 May 2016 23:08:55 +0200 Subject: [PATCH] Add size to sprite arrays --- src/paint/map_element/map_element.c | 2 +- src/ride/gentle/dodgems.c | 2 +- src/ride/gentle/spiral_slide.c | 2 +- src/ride/track_paint.c | 10 +++++----- src/ride/track_paint.h | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/paint/map_element/map_element.c b/src/paint/map_element/map_element.c index 8c9d6785d1..bd7fb42e19 100644 --- a/src/paint/map_element/map_element.c +++ b/src/paint/map_element/map_element.c @@ -291,7 +291,7 @@ void paint_util_force_set_general_support_height(sint16 height, uint8 slope) RCT2_GLOBAL(0x141E9DA, uint8) = slope; } -const uint segment_offsets[9] = { +const uint16 segment_offsets[9] = { SEGMENT_B4, SEGMENT_B8, SEGMENT_BC, diff --git a/src/ride/gentle/dodgems.c b/src/ride/gentle/dodgems.c index 7a1156e9f1..3610bec821 100644 --- a/src/ride/gentle/dodgems.c +++ b/src/ride/gentle/dodgems.c @@ -29,7 +29,7 @@ enum { SPR_DODGEMS_FENCE_TOP_LEFT = 21937 }; -const uint dodgems_fence_sprites[] = { +const uint32 dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TOP_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_LEFT, diff --git a/src/ride/gentle/spiral_slide.c b/src/ride/gentle/spiral_slide.c index 13f6b3b682..e29a4da3ab 100644 --- a/src/ride/gentle/spiral_slide.c +++ b/src/ride/gentle/spiral_slide.c @@ -152,7 +152,7 @@ static void spiral_slide_paint_tile_front(uint8 rideIndex, uint8 trackSequence, } } -static const uint spiral_slide_fence_sprites[] = { +static const uint32 spiral_slide_fence_sprites[] = { SPIRAL_SLIDE_FENCE_TOP_RIGHT, SPIRAL_SLIDE_FENCE_BOTTOM_RIGHT, SPIRAL_SLIDE_FENCE_BOTTOM_LEFT, diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index b716b66ca3..09ef4ab715 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -79,7 +79,7 @@ const uint8 edges_3x3[] = { EDGE_SW, }; -const uint16 track_map_4x4[][16] = { +const uint8 track_map_4x4[][16] = { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, @@ -105,14 +105,14 @@ const uint8 edges_4x4[] = { EDGE_SW | EDGE_SE }; -const uint floorSpritesCork[] = { +const uint32 floorSpritesCork[] = { SPR_FLOOR_CORK_SE_SW, SPR_FLOOR_CORK_SW, SPR_FLOOR_CORK_SE, SPR_FLOOR_CORK }; -const uint fenceSpritesRope[] = { +const uint32 fenceSpritesRope[] = { SPR_FENCE_ROPE_NE, SPR_FENCE_ROPE_SE, SPR_FENCE_ROPE_SW, @@ -146,7 +146,7 @@ bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_eleme return (ride->entrances[entranceId] != entranceLoc && ride->exits[entranceId] != entranceLoc); } -void track_paint_util_paint_floor(uint edges, uint32 colourFlags, uint16 height, const uint floorSprites[4], uint8 rotation) +void track_paint_util_paint_floor(uint8 edges, uint32 colourFlags, uint16 height, const uint32 floorSprites[4], uint8 rotation) { uint32 imageId; @@ -163,7 +163,7 @@ void track_paint_util_paint_floor(uint edges, uint32 colourFlags, uint16 height, sub_98197C(imageId | colourFlags, 0, 0, 32, 32, 1, height, 0, 0, height, rotation); } -void track_paint_util_paint_fences(uint edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint fenceSprites[4], uint8 rotation) +void track_paint_util_paint_fences(uint8 edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation) { uint32 imageId; diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 504ab069a5..54c440c16f 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -27,7 +27,7 @@ extern const uint8 edges_2x2[]; extern const uint8 track_map_3x3[][9]; extern const uint8 edges_3x3[]; -extern const uint16 track_map_4x4[][16]; +extern const uint8 track_map_4x4[][16]; extern const uint8 edges_4x4[]; enum { @@ -41,13 +41,13 @@ enum { SPR_FENCE_ROPE_NW = 22141, }; -extern const uint floorSpritesCork[]; +extern const uint32 floorSpritesCork[]; -extern const uint fenceSpritesRope[]; +extern const uint32 fenceSpritesRope[]; bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint8 rotation); -void track_paint_util_paint_floor(uint edges, uint32 colourFlags, uint16 height, const uint floorSprites[4], uint8 rotation); -void track_paint_util_paint_fences(uint edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint fenceSprites[4], uint8 rotation); +void track_paint_util_paint_floor(uint8 edges, uint32 colourFlags, uint16 height, const uint32 floorSprites[4], uint8 rotation); +void track_paint_util_paint_fences(uint8 edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation); typedef void (*TRACK_PAINT_FUNCTION)(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement); typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(int trackType, int direction);