mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Refactor paint_ps_money_effects

Browse Source
This commit is contained in:
Ted John
2016-10-19 12:38:50 +01:00
parent 1f810375a8
commit 67e9ccb1fc
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/viewport.c
View File

@@ -777,7 +777,9 @@ static void viewport_paint_column(rct_drawpixelinfo * dpi)
);
}
viewport_draw_money_effects();
if (gPaintPSStringHead != NULL) {
paint_ps_money_effects(dpi, gPaintPSStringHead);
}
}
/**

30
src/paint/paint.c
View File

@@ -29,8 +29,9 @@ const uint32 construction_markers[] = {
paint_struct * g_ps_F1AD28;
attached_paint_struct * g_aps_F1AD2C;
paint_string_struct *pss1;
paint_string_struct *pss2;
paint_string_struct * gPaintPSStringHead;
static paint_string_struct * _paintLastPSString;
#ifdef NO_RCT2
paint_entry gPaintStructs[4000];
@@ -88,8 +89,8 @@ void painter_setup() {
}
_F1AD0C = -1;
_F1AD10 = 0;
pss1 = NULL;
pss2 = NULL;
gPaintPSStringHead = NULL;
_paintLastPSString = NULL;
}
/**
@@ -634,15 +635,12 @@ void sub_685EBC(money32 amount, rct_string_id string_id, sint16 y, sint16 z, sin
gNextFreePaintStruct++;
paint_string_struct * oldPs = pss2;
pss2 = ps;
if (oldPs == 0) { // 0 or NULL?
pss1 = ps;
if (_paintLastPSString == NULL) {
gPaintPSStringHead = ps;
} else {
oldPs->next = ps;
_paintLastPSString->next = ps;
}
_paintLastPSString = ps;
}
/**
@@ -1074,21 +1072,17 @@ static void draw_pixel_info_crop_by_zoom(rct_drawpixelinfo *dpi)
*
* rct2: 0x006860C3
*/
void viewport_draw_money_effects(rct_drawpixelinfo * dpi)
void paint_ps_money_effects(rct_drawpixelinfo * dpi, paint_string_struct * ps)
{
utf8 buffer[256];
paint_string_struct *ps = pss1;
if (ps == NULL)
return;
rct_drawpixelinfo dpi2 = *dpi;
draw_pixel_info_crop_by_zoom(&dpi2);
do {
utf8 buffer[256];
format_string(buffer, 256, ps->string_id, &ps->args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
// Use sprite font unless the currency contains characters unsupported by the sprite font
bool forceSpriteFont = false;
const currency_descriptor *currencyDesc = &CurrencyDescriptors[gConfigGeneral.currency_format];
if (gUseTrueTypeFont && font_supports_string_sprite(currencyDesc->symbol_unicode)) {

4
src/paint/paint.h
View File

@@ -147,6 +147,8 @@ extern support_height gSupportSegments[9];
extern support_height gSupport;
#endif
extern paint_string_struct * gPaintPSStringHead;
/** rct2: 0x00993CC4 */
extern const uint32 construction_markers[];
extern bool gPaintBoundingBoxes;
@@ -168,9 +170,9 @@ 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_draw_money_effects();
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);
// TESTING
#ifdef __TESTPAINT__