mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 18:07:53 +01:00
Code Issues Releases Wiki Activity

Rename paint functions

Browse Source
This commit is contained in:
Ted John
2016-10-19 17:28:55 +01:00
parent 504257ce08
commit 86dd18a65d
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/interface/viewport.c
View File

@@ -748,9 +748,9 @@ static void viewport_paint_column(rct_drawpixelinfo * dpi, uint32 viewFlags)
gfx_clear(dpi, colour);
}
paint_init(dpi);
viewport_paint_setup();
sub_688217();
paint_quadrant_ps(dpi, &unk_EE7884->basic, viewFlags);
paint_generate_structs();
paint_arrange_structs();
paint_draw_structs(dpi, &unk_EE7884->basic, viewFlags);
if (gConfigGeneral.render_weather_gloom &&
!gTrackDesignSaveMode &&
@@ -760,7 +760,7 @@ static void viewport_paint_column(rct_drawpixelinfo * dpi, uint32 viewFlags)
}
if (gPaintPSStringHead != NULL) {
paint_ps_money_effects(dpi, gPaintPSStringHead);
paint_draw_money_structs(dpi, gPaintPSStringHead);
}
}
@@ -1395,8 +1395,8 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
dpi->x = _viewportDpi1.x;
dpi->width = 1;
paint_init(dpi);
viewport_paint_setup();
sub_688217();
paint_generate_structs();
paint_arrange_structs();
sub_68862C();
}
if (viewport != NULL) *viewport = myviewport;

1
src/interface/viewport.h
View File

@@ -152,7 +152,6 @@ void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rc
void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y);
void sub_68B2B7(int x, int y);
void sub_688217();
void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, int bottom);

14
src/paint/paint.c
View File

@@ -650,7 +650,7 @@ void sub_685EBC(money32 amount, rct_string_id string_id, sint16 y, sint16 z, sin
*
* rct2: 0x0068B6C2
*/
void viewport_paint_setup()
void paint_generate_structs()
{
rct_drawpixelinfo* dpi = unk_140E9A8;
@@ -757,7 +757,7 @@ void viewport_paint_setup()
}
}
static void sub_688217_helper(uint16 ax, uint8 flag)
static void paint_arrange_structs_helper(uint16 ax, uint8 flag)
{
paint_struct *ps, *ps_temp;
paint_struct *ps_next = &unk_EE7884->basic;
@@ -867,7 +867,7 @@ static void sub_688217_helper(uint16 ax, uint8 flag)
*
* rct2: 0x00688217
*/
void sub_688217()
void paint_arrange_structs()
{
unk_EE7884 = gNextFreePaintStruct++;
paint_struct * ps = &unk_EE7884->basic;
@@ -885,10 +885,10 @@ void sub_688217()
}
} while (++edi <= _F1AD10);
sub_688217_helper(_F1AD0C & 0xFFFF, 1 << 1);
paint_arrange_structs_helper(_F1AD0C & 0xFFFF, 1 << 1);
uint32 eax = _F1AD0C;
while (++eax < _F1AD10) {
sub_688217_helper(eax & 0xFFFF, 0);
paint_arrange_structs_helper(eax & 0xFFFF, 0);
}
}
}
@@ -897,7 +897,7 @@ void sub_688217()
*
* rct2: 0x00688485
*/
void paint_quadrant_ps(rct_drawpixelinfo * dpi, paint_struct * ps, uint32 viewFlags)
void paint_draw_structs(rct_drawpixelinfo * dpi, paint_struct * ps, uint32 viewFlags)
{
paint_struct* previous_ps = ps->next_quadrant_ps;
for (ps = ps->next_quadrant_ps; ps;) {
@@ -1069,7 +1069,7 @@ static void draw_pixel_info_crop_by_zoom(rct_drawpixelinfo *dpi)
*
* rct2: 0x006860C3
*/
void paint_ps_money_effects(rct_drawpixelinfo * dpi, paint_string_struct * ps)
void paint_draw_money_structs(rct_drawpixelinfo * dpi, paint_string_struct * ps)
{
rct_drawpixelinfo dpi2 = *dpi;
draw_pixel_info_crop_by_zoom(&dpi2);

10
src/paint/paint.h
View File

@@ -153,8 +153,6 @@ extern paint_string_struct * gPaintPSStringHead;
extern const uint32 construction_markers[];
extern bool gPaintBoundingBoxes;
void paint_init(rct_drawpixelinfo * dpi);
paint_struct * sub_98196C(uint32 image_id, sint8 x_offset, sint8 y_offset, sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z, sint16 z_offset, uint32 rotation);
paint_struct * sub_98197C(uint32 image_id, sint8 x_offset, sint8 y_offset, sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z, sint16 z_offset, sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z, uint32 rotation);
paint_struct * sub_98198C(uint32 image_id, sint8 x_offset, sint8 y_offset, sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z, sint16 z_offset, sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z, uint32 rotation);
@@ -170,9 +168,11 @@ bool paint_attach_to_previous_attach(uint32 image_id, uint16 x, uint16 y);
bool paint_attach_to_previous_ps(uint32 image_id, uint16 x, uint16 y);
void sub_685EBC(money32 amount, rct_string_id string_id, sint16 y, sint16 z, sint8 y_offsets[], sint16 offset_x, uint32 rotation);
void viewport_paint_setup();
void paint_quadrant_ps(rct_drawpixelinfo * dpi, paint_struct * ps, uint32 viewFlags);
void paint_ps_money_effects(rct_drawpixelinfo * dpi, paint_string_struct * ps);
void paint_init(rct_drawpixelinfo * dpi);
void paint_generate_structs();
void paint_arrange_structs();
void paint_draw_structs(rct_drawpixelinfo * dpi, paint_struct * ps, uint32 viewFlags);
void paint_draw_money_structs(rct_drawpixelinfo * dpi, paint_string_struct * ps);
// TESTING
#ifdef __TESTPAINT__

4
src/windows/ride_construction.c
View File

@@ -2412,8 +2412,8 @@ static void sub_6CBCE2(
gMapSize = preserveMapSize;
gMapSizeMaxXY = preserveMapSizeMaxXY;
sub_688217();
paint_quadrant_ps(unk_140E9A8, &unk_EE7884->basic, gCurrentViewportFlags);
paint_arrange_structs();
paint_draw_structs(unk_140E9A8, &unk_EE7884->basic, gCurrentViewportFlags);
gCurrentViewportFlags = preserve_current_viewport_flags;
}