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

Merge pull request #4199 from marijnvdwerf/clean/sprite-ids-1 

Cleanup sprite ids
This commit is contained in:
Ted John 2016-08-05 17:30:03 +01:00 committed by GitHub
parent a66f55269b cd00c0de31
commit c3fdb99ceb
3 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drawing/scrolling_text.c
View File

@ -19,6 +19,7 @@
#include "../interface/colour.h"
#include "../localisation/localisation.h"
#include "drawing.h"
#include "../sprites.h"
#pragma pack(push, 1)
/* size: 0xA12 */
@ -56,7 +57,7 @@ void scrolling_text_initialise_bitmaps()
for (int i = 0; i < 224; i++) {
memset(drawingSurface, 0, sizeof(drawingSurface));
gfx_draw_sprite_software(&dpi, i + 0x10D5, -1, 0, 0);
gfx_draw_sprite_software(&dpi, SPR_CHAR_START + FONT_SPRITE_BASE_TINY + i, -1, 0, 0);
for (int x = 0; x < 8; x++) {
uint8 val = 0;
@ -103,7 +104,7 @@ static int scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16
scrollText->mode == scrollingMode
) {
scrollText->id = RCT2_GLOBAL(RCT2_ADDRESS_DRAW_SCROLL_NEXT_ID, uint32);
return i + 0x606;
return i + SPR_SCROLLING_TEXT_START;
}
}
return scrollIndex;
@ -112,7 +113,7 @@ static int scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16
static uint8 scrolling_text_get_colour(uint32 character)
{
int colour = character & 0x7F;
if (character & (1 << 7)) {
if (character & COLOUR_FLAG_TRANSLUCENT) {
return ColourMapA[colour].light;
} else {
return ColourMapA[colour].mid_dark;
@ -1408,12 +1409,12 @@ int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrolling
rct_drawpixelinfo* dpi = unk_140E9A8;
if (dpi->zoom_level != 0) return 0x626;
if (dpi->zoom_level != 0) return SPR_SCROLLING_TEXT_DEFAULT;
RCT2_GLOBAL(RCT2_ADDRESS_DRAW_SCROLL_NEXT_ID, uint32)++;
int scrollIndex = scrolling_text_get_matching_or_oldest(stringId, scroll, scrollingMode);
if (scrollIndex >= 0x606) return scrollIndex;
if (scrollIndex >= SPR_SCROLLING_TEXT_START) return scrollIndex;
// Setup scrolling text
uint32 stringArgs0, stringArgs1;
@ -1441,7 +1442,7 @@ int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrolling
scrolling_text_set_bitmap_for_sprite(scrollString, scroll, scrollText->bitmap, scrollingModePositions);
}
uint32 imageId = 0x606 + scrollIndex;
uint32 imageId = SPR_SCROLLING_TEXT_START + scrollIndex;
drawing_engine_invalidate_image(imageId);
return imageId;
}
@ -1463,7 +1464,7 @@ void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap,
// Set any change in colour
if (codepoint <= FORMAT_COLOUR_CODE_END && codepoint >= FORMAT_COLOUR_CODE_START){
codepoint -= FORMAT_COLOUR_CODE_START;
characterColour = g1Elements[4914].offset[codepoint * 4];
characterColour = g1Elements[SPR_TEXT_PALETTE].offset[codepoint * 4];
continue;
}
@ -1523,7 +1524,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, co
if (colour == 0) {
colour = scrolling_text_get_colour(gCommonFormatArgs[7]);
} else {
colour = RCT2_GLOBAL(0x009FF048, uint8*)[(colour - FORMAT_COLOUR_CODE_START) * 4];
colour = g1Elements[SPR_TEXT_PALETTE].offset[colour - FORMAT_COLOUR_CODE_START];
}
SDL_Surface *surface = ttf_surface_cache_get_or_add(fontDesc->font, text);

21
src/drawing/sprite.c
View File

@ -31,6 +31,17 @@ rct_gx g2;
rct_g1_element *g1Elements = (rct_g1_element*)RCT2_ADDRESS_G1_ELEMENTS;
#endif
static const uint32 fadeSprites[] = {
SPR_NONE,
SPR_FADE_1,
SPR_FADE_2,
SPR_FADE_3,
SPR_FADE_4,
SPR_FADE_5,
SPR_FADE_6,
SPR_FADE_7,
};
static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element *elements)
{
rct_g1_element_32bit *g1Elements32 = calloc(count, sizeof(rct_g1_element_32bit));
@ -179,9 +190,13 @@ int gfx_load_g2()
*/
void sub_68371D()
{
unk_9E3CE4[0] = NULL;
for (int i = 1; i < 8; i++) {
unk_9E3CE4[i] = g1Elements[23199 + i].offset;
for (int i = 0; i < countof(fadeSprites); i++) {
const uint32 spriteId = fadeSprites[i];
if (spriteId == SPR_NONE) {
unk_9E3CE4[i] = NULL;
} else {
unk_9E3CE4[i] = g1Elements[fadeSprites[i]].offset;
}
}
}

11
src/sprites.h
View File

@ -20,6 +20,9 @@
enum {
SPR_NONE = -1,
SPR_SCROLLING_TEXT_START = 1542,
SPR_SCROLLING_TEXT_DEFAULT = 1574,
SPR_PALETTE_1_START = 3100,
SPR_PALETTE_1_END = 3110,
@ -662,7 +665,13 @@ enum {
SPR_RATING_LOW = 23197,
SPR_RATING_HIGH = 23198,
SPR_MENU_CHECKMARK = 23199,
SPR_FADE_1 = 23200,
SPR_FADE_2 = 23201,
SPR_FADE_3 = 23202,
SPR_FADE_4 = 23203,
SPR_FADE_5 = 23204,
SPR_FADE_6 = 23205,
SPR_FADE_7 = 23206,
SPR_MENU_NEW_GAME = 23207,
SPR_MENU_LOAD_GAME = 23208,
SPR_MENU_TUTORIAL = 23209,