mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add size to sprite arrays

This commit is contained in:
Marijn van der Werf 2016-05-17 23:08:55 +02:00
parent 8756f4cff0
commit 5a5eea6837
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/paint/map_element/map_element.c
View File

@ -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,

2
src/ride/gentle/dodgems.c
View File

@ -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,

2
src/ride/gentle/spiral_slide.c
View File

@ -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,

10
src/ride/track_paint.c
View File

@ -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;

10
src/ride/track_paint.h
View File

@ -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);