From c4cf41de45dfaeceb27917e25650872a0c4efc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 28 Feb 2016 21:24:22 +0100 Subject: [PATCH] Only enable assert() in drawing code when explicitly debugging --- src/drawing/drawing.c | 2 +- src/drawing/drawing.h | 1 + src/drawing/sprite.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index e51c8f4c8d..3c98306f68 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -63,7 +63,7 @@ uint8 text_palette[0x8] = { }; // Previously 0x97FCBC use it to get the correct palette from g1_elements -const uint16 palette_to_g1_offset[] = { +const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = { 0x1333, 0x1334, 0x1335, 0x1336, 0x1337, 0x1338, 0x1339, 0x133A, 0x133B, 0x133C, 0x133D, 0x133E, diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index 5ac68c701a..d0cf9e729e 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -82,6 +82,7 @@ typedef struct { #define SPRITE_ID_PALETTE_COLOUR_1(colourId) ((IMAGE_TYPE_USE_PALETTE << 28) | ((colourId) << 19)) +#define PALETTE_TO_G1_OFFSET_COUNT 144 extern const uint16 palette_to_g1_offset[]; extern const uint8 peep_palette[]; extern uint8 text_palette[]; diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c index b34bcc995f..177f909535 100644 --- a/src/drawing/sprite.c +++ b/src/drawing/sprite.c @@ -319,7 +319,9 @@ void FASTCALL gfx_draw_sprite(rct_drawpixelinfo *dpi, int image_id, int x, int y uint32 primary_offset = palette_to_g1_offset[(image_id >> 19) & 0x1F]; uint32 secondary_offset = palette_to_g1_offset[(image_id >> 24) & 0x1F]; - assert(tertiary_colour < 144); +#if DEBUG_LEVEL_2 + assert(tertiary_colour < PALETTE_TO_G1_OFFSET_COUNT); +#endif // DEBUG_LEVEL_2 uint32 tertiary_offset = palette_to_g1_offset[tertiary_colour]; rct_g1_element* primary_colour = &g1Elements[primary_offset];