mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Integrate gCurrentFont fully

Browse Source
This commit is contained in:
Ted John
2016-09-12 20:43:43 +01:00
parent 8d5a553c0a
commit 44214ab2b8
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/addresses.h
View File

@@ -93,9 +93,6 @@
#define RCT2_ADDRESS_SAVED_VIEW_ZOOM 0x0138869E
#define RCT2_ADDRESS_SAVED_VIEW_ROTATION 0x0138869F
#define RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE 0x013CE950
#define RCT2_ADDRESS_CURRENT_FONT_FLAGS 0x013CE9A2
#define RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS 0x013CE9A4
#define RCT2_ADDRESS_CURRENT_ROTATION 0x0141E9E0
@@ -514,6 +511,8 @@
#define RCT2_ADDRESS_CURRENT_RAIN_LEVEL 0x013CA752
#define RCT2_ADDRESS_NEXT_RAIN_LEVEL 0x013CA753
#define RCT2_ADDRESS_NEWS_ITEM_LIST 0x013CA754
#define RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE 0x013CE950
#define RCT2_ADDRESS_CURRENT_FONT_FLAGS 0x013CE9A2
#define RCT2_ADDRESS_COMMON_FORMAT_ARGS 0x013CE952

5
src/drawing/drawing.c
View File

@@ -26,6 +26,9 @@
int gLastDrawStringX;
int gLastDrawStringY;
sint16 gCurrentFontSpriteBase;
uint16 gCurrentFontFlags;
uint8 gGamePalette[256 * 4];
uint32 gPaletteEffectFrame;
@@ -38,8 +41,6 @@ void *unk_9E3CDC;
void *unk_9E3CE4[8];
#ifdef NO_RCT2
rct_drawpixelinfo *unk_140E9A8;
sint16 gCurrentFontSpriteBase;
uint16 gCurrentFontFlags;
#endif
/**

5
src/drawing/drawing.h
View File

@@ -121,13 +121,8 @@ typedef struct rct_palette {
#define PALETTE_TO_G1_OFFSET_COUNT 144
#ifndef NO_RCT2
#define gCurrentFontSpriteBase RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16)
#define gCurrentFontFlags RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_FLAGS, uint16)
#else
extern sint16 gCurrentFontSpriteBase;
extern uint16 gCurrentFontFlags;
#endif
extern uint8 gGamePalette[256 * 4];
extern uint32 gPaletteEffectFrame;