mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Refactor paint_arrange_structs

Browse Source
This commit is contained in:
Ted John
2016-10-19 18:14:25 +01:00
parent 86dd18a65d
commit 60df18ee0f
5 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/interface/viewport.c
View File

@@ -52,7 +52,6 @@ uint8 gSavedViewZoom;
uint8 gSavedViewRotation;
#ifdef NO_RCT2
paint_entry *unk_EE7884;
paint_entry *gNextFreePaintStruct;
uint8 gCurrentRotation;
uint32 gCurrentViewportFlags = 0;
@@ -748,9 +747,9 @@ static void viewport_paint_column(rct_drawpixelinfo * dpi, uint32 viewFlags)
gfx_clear(dpi, colour);
}
paint_init(dpi);
paint_generate_structs();
paint_arrange_structs();
paint_draw_structs(dpi, &unk_EE7884->basic, viewFlags);
paint_generate_structs(dpi);
paint_struct ps = paint_arrange_structs();
paint_draw_structs(dpi, &ps, viewFlags);
if (gConfigGeneral.render_weather_gloom &&
!gTrackDesignSaveMode &&
@@ -1323,15 +1322,11 @@ static bool sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
*
* rct2: 0x0068862C
*/
static void sub_68862C()
static void sub_68862C(rct_drawpixelinfo * dpi, paint_struct * ps)
{
rct_drawpixelinfo *dpi = unk_140E9A8;
paint_struct *ps = &unk_EE7884->basic, *old_ps, *next_ps;
while ((ps = ps->next_quadrant_ps) != NULL) {
old_ps = ps;
next_ps = ps;
paint_struct * old_ps = ps;
paint_struct * next_ps = ps;
while (next_ps != NULL) {
ps = next_ps;
if (sub_679023(dpi, ps->image_id, ps->x, ps->y))
@@ -1395,9 +1390,9 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
dpi->x = _viewportDpi1.x;
dpi->width = 1;
paint_init(dpi);
paint_generate_structs();
paint_arrange_structs();
sub_68862C();
paint_generate_structs(dpi);
paint_struct ps = paint_arrange_structs();
sub_68862C(dpi, &ps);
}
if (viewport != NULL) *viewport = myviewport;
}

2
src/interface/viewport.h
View File

@@ -105,12 +105,10 @@ extern uint8 gSavedViewZoom;
extern uint8 gSavedViewRotation;
#ifdef NO_RCT2
extern paint_entry *unk_EE7884;
extern paint_entry *gNextFreePaintStruct;
extern uint8 gCurrentRotation;
extern uint32 gCurrentViewportFlags;
#else
#define unk_EE7884 RCT2_GLOBAL(0x00EE7884, paint_entry*)
#define gNextFreePaintStruct RCT2_GLOBAL(0x00EE7888, paint_entry*)
#define gCurrentRotation RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8)
#define gCurrentViewportFlags RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint32)