mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove unused global palette pointer (#6247)
Moved one use of the palette pointer into a parameter
This commit is contained in:
parent
49066bac4a
commit
04e217a04c
|
@ -39,7 +39,6 @@ uint32 gPickupPeepImage;
|
||||||
sint32 gPickupPeepX;
|
sint32 gPickupPeepX;
|
||||||
sint32 gPickupPeepY;
|
sint32 gPickupPeepY;
|
||||||
|
|
||||||
uint8 *gCurrentColourPalette;
|
|
||||||
#ifdef NO_RCT2
|
#ifdef NO_RCT2
|
||||||
rct_drawpixelinfo *unk_140E9A8;
|
rct_drawpixelinfo *unk_140E9A8;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -281,7 +281,6 @@ extern rct_g1_element *g1Elements;
|
||||||
extern rct_drawpixelinfo gScreenDPI;
|
extern rct_drawpixelinfo gScreenDPI;
|
||||||
extern rct_drawpixelinfo gWindowDPI;
|
extern rct_drawpixelinfo gWindowDPI;
|
||||||
|
|
||||||
extern uint8 *gCurrentColourPalette;
|
|
||||||
#ifdef NO_RCT2
|
#ifdef NO_RCT2
|
||||||
extern rct_drawpixelinfo *unk_140E9A8;
|
extern rct_drawpixelinfo *unk_140E9A8;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -437,7 +437,6 @@ static void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette
|
||||||
palette_pointer[2] = (eax >> 8) & 0xFF;
|
palette_pointer[2] = (eax >> 8) & 0xFF;
|
||||||
palette_pointer[3] = (eax >> 16) & 0xFF;
|
palette_pointer[3] = (eax >> 16) & 0xFF;
|
||||||
palette_pointer[4] = (eax >> 24) & 0xFF;
|
palette_pointer[4] = (eax >> 24) & 0xFF;
|
||||||
gCurrentColourPalette = palette_pointer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -458,7 +457,6 @@ static void colour_char_window(uint8 colour, uint16* current_font_flags,uint8* p
|
||||||
palette_pointer[2] = (eax >> 8) & 0xFF;
|
palette_pointer[2] = (eax >> 8) & 0xFF;
|
||||||
palette_pointer[3] = (eax >> 16) & 0xFF;
|
palette_pointer[3] = (eax >> 16) & 0xFF;
|
||||||
palette_pointer[4] = (eax >> 24) & 0xFF;
|
palette_pointer[4] = (eax >> 24) & 0xFF;
|
||||||
gCurrentColourPalette = palette_pointer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -694,7 +692,6 @@ static void ttf_draw_character_sprite(rct_drawpixelinfo *dpi, sint32 codepoint,
|
||||||
sint32 sprite = font_sprite_get_codepoint_sprite(info->font_sprite_base, codepoint);
|
sint32 sprite = font_sprite_get_codepoint_sprite(info->font_sprite_base, codepoint);
|
||||||
|
|
||||||
if (!(info->flags & TEXT_DRAW_FLAG_NO_DRAW)) {
|
if (!(info->flags & TEXT_DRAW_FLAG_NO_DRAW)) {
|
||||||
gCurrentColourPalette = info->palette;
|
|
||||||
|
|
||||||
sint32 x = info->x;
|
sint32 x = info->x;
|
||||||
sint32 y = info->y;
|
sint32 y = info->y;
|
||||||
|
@ -852,9 +849,6 @@ static const utf8 *ttf_process_format_code(rct_drawpixelinfo *dpi, const utf8 *t
|
||||||
// Adjust the text palette
|
// Adjust the text palette
|
||||||
memcpy(info->palette + 3, &(g1Element->offset[247]), 2);
|
memcpy(info->palette + 3, &(g1Element->offset[247]), 2);
|
||||||
memcpy(info->palette + 5, &(g1Element->offset[250]), 2);
|
memcpy(info->palette + 5, &(g1Element->offset[250]), 2);
|
||||||
|
|
||||||
// Set the palette pointer
|
|
||||||
gCurrentColourPalette = info->palette;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 3:
|
case 3:
|
||||||
|
@ -1034,7 +1028,6 @@ static void ttf_process_initial_colour(sint32 colour, text_draw_info *info)
|
||||||
info->palette[2] = (eax >> 8) & 0xFF;
|
info->palette[2] = (eax >> 8) & 0xFF;
|
||||||
info->palette[3] = (eax >> 16) & 0xFF;
|
info->palette[3] = (eax >> 16) & 0xFF;
|
||||||
info->palette[4] = (eax >> 24) & 0xFF;
|
info->palette[4] = (eax >> 24) & 0xFF;
|
||||||
gCurrentColourPalette = info->palette;
|
|
||||||
eax = 0;
|
eax = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1031,14 +1031,14 @@ static void store_interaction_info(paint_struct *ps)
|
||||||
/**
|
/**
|
||||||
* rct2: 0x00679236, 0x00679662, 0x00679B0D, 0x00679FF1
|
* rct2: 0x00679236, 0x00679662, 0x00679B0D, 0x00679FF1
|
||||||
*/
|
*/
|
||||||
static bool pixel_is_present_bmp(uint32 imageType, rct_g1_element *image, uint8 *index) {
|
static bool pixel_is_present_bmp(uint32 imageType, rct_g1_element *image, uint8 *index, uint8 *palette) {
|
||||||
// Probably used to check for corruption
|
// Probably used to check for corruption
|
||||||
if (!(image->flags & G1_FLAG_BMP)) {
|
if (!(image->flags & G1_FLAG_BMP)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (imageType & IMAGE_TYPE_REMAP) {
|
if (imageType & IMAGE_TYPE_REMAP) {
|
||||||
return gCurrentColourPalette[*index] != 0;
|
return palette[*index] != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (imageType & IMAGE_TYPE_TRANSPARENT) {
|
if (imageType & IMAGE_TYPE_TRANSPARENT) {
|
||||||
|
@ -1126,7 +1126,7 @@ static bool is_pixel_present_rle(uint8 *esi, sint16 x_start_point, sint16 y_star
|
||||||
* @param y (dx)
|
* @param y (dx)
|
||||||
* @return value originally stored in 0x00141F569
|
* @return value originally stored in 0x00141F569
|
||||||
*/
|
*/
|
||||||
static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16 y)
|
static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16 y, uint8 *palette)
|
||||||
{
|
{
|
||||||
rct_g1_element *image = gfx_get_g1_element(imageId & 0x7FFFF);
|
rct_g1_element *image = gfx_get_g1_element(imageId & 0x7FFFF);
|
||||||
|
|
||||||
|
@ -1147,7 +1147,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16
|
||||||
.zoom_level = dpi->zoom_level - 1
|
.zoom_level = dpi->zoom_level - 1
|
||||||
};
|
};
|
||||||
|
|
||||||
return sub_679074(&zoomed_dpi, imageId - image->zoomed_offset, x / 2, y / 2);
|
return sub_679074(&zoomed_dpi, imageId - image->zoomed_offset, x / 2, y / 2, palette);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1233,7 +1233,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16
|
||||||
uint32 imageType = gCurrentImageType;
|
uint32 imageType = gCurrentImageType;
|
||||||
|
|
||||||
if (!(image->flags & G1_FLAG_1)) {
|
if (!(image->flags & G1_FLAG_1)) {
|
||||||
return pixel_is_present_bmp(imageType, image, offset);
|
return pixel_is_present_bmp(imageType, image, offset, palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adding assert here, possibly dead code below. Remove after some time.
|
// Adding assert here, possibly dead code below. Remove after some time.
|
||||||
|
@ -1274,7 +1274,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16
|
||||||
source_pointer = (uint8 *) ebx1;
|
source_pointer = (uint8 *) ebx1;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool output = pixel_is_present_bmp(imageType, image, new_source_pointer_start + (uintptr_t) offset);
|
bool output = pixel_is_present_bmp(imageType, image, new_source_pointer_start + (uintptr_t) offset, palette);
|
||||||
free(new_source_pointer_start);
|
free(new_source_pointer_start);
|
||||||
|
|
||||||
return output;
|
return output;
|
||||||
|
@ -1286,6 +1286,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16
|
||||||
*/
|
*/
|
||||||
static bool sub_679023(rct_drawpixelinfo *dpi, sint32 imageId, sint32 x, sint32 y)
|
static bool sub_679023(rct_drawpixelinfo *dpi, sint32 imageId, sint32 x, sint32 y)
|
||||||
{
|
{
|
||||||
|
uint8 *palette = NULL;
|
||||||
imageId &= 0xBFFFFFFF;
|
imageId &= 0xBFFFFFFF;
|
||||||
if (imageId & IMAGE_TYPE_REMAP) {
|
if (imageId & IMAGE_TYPE_REMAP) {
|
||||||
gCurrentImageType = IMAGE_TYPE_REMAP;
|
gCurrentImageType = IMAGE_TYPE_REMAP;
|
||||||
|
@ -1294,11 +1295,11 @@ static bool sub_679023(rct_drawpixelinfo *dpi, sint32 imageId, sint32 x, sint32
|
||||||
index &= 0x1F;
|
index &= 0x1F;
|
||||||
}
|
}
|
||||||
sint32 g1Index = palette_to_g1_offset[index];
|
sint32 g1Index = palette_to_g1_offset[index];
|
||||||
gCurrentColourPalette = g1Elements[g1Index].offset;
|
palette = g1Elements[g1Index].offset;
|
||||||
} else {
|
} else {
|
||||||
gCurrentImageType = 0;
|
gCurrentImageType = 0;
|
||||||
}
|
}
|
||||||
return sub_679074(dpi, imageId, x, y);
|
return sub_679074(dpi, imageId, x, y, palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue