mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix usage of paint_entry in 64-bit builds (#12)
This commit is contained in:
parent
7561921b9c
commit
0cc33d7780
|
@ -52,8 +52,8 @@ uint8 gSavedViewZoom;
|
|||
uint8 gSavedViewRotation;
|
||||
|
||||
#ifdef NO_RCT2
|
||||
paint_struct *unk_EE7884;
|
||||
paint_struct *gNextFreePaintStruct;
|
||||
paint_entry *unk_EE7884;
|
||||
paint_entry *gNextFreePaintStruct;
|
||||
uint8 gCurrentRotation;
|
||||
uint32 gCurrentViewportFlags = 0;
|
||||
#endif
|
||||
|
|
|
@ -105,8 +105,8 @@ extern uint8 gSavedViewZoom;
|
|||
extern uint8 gSavedViewRotation;
|
||||
|
||||
#ifdef NO_RCT2
|
||||
extern paint_struct *unk_EE7884;
|
||||
extern paint_struct *gNextFreePaintStruct;
|
||||
extern paint_entry *unk_EE7884;
|
||||
extern paint_entry *gNextFreePaintStruct;
|
||||
extern uint8 gCurrentRotation;
|
||||
extern uint32 gCurrentViewportFlags;
|
||||
#else
|
||||
|
|
|
@ -33,12 +33,12 @@ paint_string_struct *pss1;
|
|||
paint_string_struct *pss2;
|
||||
|
||||
#ifdef NO_RCT2
|
||||
paint_struct gPaintStructs[4000];
|
||||
paint_entry gPaintStructs[4000];
|
||||
uint32 _F1AD0C;
|
||||
uint32 _F1AD10;
|
||||
static paint_struct *_paint_struct_quadrants[512];
|
||||
void *g_currently_drawn_item;
|
||||
paint_struct * gEndOfPaintStructArray;
|
||||
paint_entry * gEndOfPaintStructArray;
|
||||
sint16 gUnk9DE568;
|
||||
sint16 gUnk9DE56C;
|
||||
paint_struct gUnkF1A4CC;
|
||||
|
|
|
@ -24,24 +24,9 @@
|
|||
#include "../drawing/drawing.h"
|
||||
|
||||
typedef struct attached_paint_struct attached_paint_struct;
|
||||
struct paint_struct;
|
||||
typedef struct paint_struct paint_struct;
|
||||
typedef union paint_entry paint_entry;
|
||||
|
||||
#ifdef NO_RCT2
|
||||
extern void *g_currently_drawn_item;
|
||||
extern paint_entry * gEndOfPaintStructArray;
|
||||
extern sint16 gUnk9DE568;
|
||||
extern sint16 gUnk9DE56C;
|
||||
extern paint_entry gPaintStructs[4000];
|
||||
#else
|
||||
#define gPaintStructs RCT2_ADDRESS(0x00EE788C, paint_entry)
|
||||
#define g_currently_drawn_item RCT2_GLOBAL(0x009DE578, void*)
|
||||
#define gEndOfPaintStructArray RCT2_GLOBAL(0x00EE7880, paint_entry *)
|
||||
#define gUnk9DE568 RCT2_GLOBAL(0x009DE568, sint16)
|
||||
#define gUnk9DE56C RCT2_GLOBAL(0x009DE56C, sint16)
|
||||
#endif
|
||||
|
||||
#pragma pack(push, 1)
|
||||
/* size 0x12 */
|
||||
struct attached_paint_struct {
|
||||
|
@ -138,6 +123,20 @@ typedef struct support_height {
|
|||
uint8 pad;
|
||||
} support_height;
|
||||
|
||||
#ifdef NO_RCT2
|
||||
extern void *g_currently_drawn_item;
|
||||
extern paint_entry * gEndOfPaintStructArray;
|
||||
extern sint16 gUnk9DE568;
|
||||
extern sint16 gUnk9DE56C;
|
||||
extern paint_entry gPaintStructs[4000];
|
||||
#else
|
||||
#define gPaintStructs RCT2_ADDRESS(0x00EE788C, paint_entry)
|
||||
#define g_currently_drawn_item RCT2_GLOBAL(0x009DE578, void*)
|
||||
#define gEndOfPaintStructArray RCT2_GLOBAL(0x00EE7880, paint_entry *)
|
||||
#define gUnk9DE568 RCT2_GLOBAL(0x009DE568, sint16)
|
||||
#define gUnk9DE56C RCT2_GLOBAL(0x009DE56C, sint16)
|
||||
#endif
|
||||
|
||||
#ifndef NO_RCT2
|
||||
#define gPaintInteractionType RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8)
|
||||
#define gSupportSegments RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_SUPPORT_SEGMENTS, support_height)
|
||||
|
|
Loading…
Reference in New Issue