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

Integrate gUnkF1A4CC

This commit is contained in:
Ted John 2016-09-17 16:14:46 +01:00
parent 4f34accfea
commit f4cf1d6158
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/viewport.c
View File

@ -770,7 +770,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
}
gfx_clear(dpi2, colour);
}
g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
g_ps_EE7880 = &gUnkF1A4CC;
unk_140E9A8 = dpi2;
painter_setup();
viewport_paint_setup();
@ -1399,7 +1399,7 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
dpi->zoom_level = _viewportDpi1.zoom_level;
dpi->x = _viewportDpi1.x;
dpi->width = 1;
g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
g_ps_EE7880 = &gUnkF1A4CC;
unk_140E9A8 = dpi;
painter_setup();
viewport_paint_setup();

1
src/paint/paint.c
View File

@ -41,6 +41,7 @@ void *g_currently_drawn_item;
paint_struct * g_ps_EE7880;
sint16 gUnk9DE568;
sint16 gUnk9DE56C;
paint_struct gUnkF1A4CC;
uint8 gPaintInteractionType;
support_height gSupportSegments[9] = { 0 };
support_height gSupport;

2
src/paint/paint.h
View File

@ -34,11 +34,13 @@ typedef struct paint_struct paint_struct;
extern paint_struct * g_ps_EE7880;
extern sint16 gUnk9DE568;
extern sint16 gUnk9DE56C;
extern paint_struct gUnkF1A4CC;
#else
#define g_currently_drawn_item RCT2_GLOBAL(0x009DE578, void*)
#define g_ps_EE7880 RCT2_GLOBAL(0x00EE7880, paint_struct *)
#define gUnk9DE568 RCT2_GLOBAL(0x009DE568, sint16)
#define gUnk9DE56C RCT2_GLOBAL(0x009DE56C, sint16)
#define gUnkF1A4CC RCT2_GLOBAL(0x00F1A4CC, paint_struct);
#endif
#pragma pack(push, 1)

2
src/windows/ride_construction.c
View File

@ -2311,7 +2311,7 @@ static void sub_6CBCE2(
gCurrentViewportFlags = 0;
trackDirection &= 3;
g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
g_ps_EE7880 = &gUnkF1A4CC;
painter_setup();
ride = get_ride(rideIndex);