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

Fix double negative showing on money effects

This commit is contained in:
Ted John 2017-06-06 18:58:14 +01:00
parent 2f053800ba
commit 430ab2db5c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/paint/sprite/misc.c
View File

@ -56,8 +56,9 @@ void misc_paint(rct_sprite *misc, sint32 imageDirection)
}
rct_money_effect * moneyEffect = &misc->money_effect;
rct_string_id stringId = money_effect_get_string_id(moneyEffect);
paint_floating_money_effect(moneyEffect->value, stringId, moneyEffect->y, moneyEffect->z, (sint8 *) &money_wave[moneyEffect->wiggle % 22], moneyEffect->offset_x, get_current_rotation());
money32 value;
rct_string_id stringId = money_effect_get_string_id(moneyEffect, &value);
paint_floating_money_effect(value, stringId, moneyEffect->y, moneyEffect->z, (sint8 *) &money_wave[moneyEffect->wiggle % 22], moneyEffect->offset_x, get_current_rotation());
break;
}

5
src/openrct2/world/money_effect.c
View File

@ -48,7 +48,7 @@ void money_effect_create_at(money32 value, sint32 x, sint32 y, sint32 z, bool ve
moneyEffect->move_delay = 0;
// Construct string to display
rct_string_id stringId = money_effect_get_string_id(moneyEffect);
rct_string_id stringId = money_effect_get_string_id(moneyEffect, &value);
char buffer[128];
format_string(buffer, 128, stringId, &value);
@ -126,7 +126,7 @@ void money_effect_update(rct_money_effect *moneyEffect)
sprite_remove((rct_sprite*)moneyEffect);
}
rct_string_id money_effect_get_string_id(const rct_money_effect * sprite)
rct_string_id money_effect_get_string_id(const rct_money_effect * sprite, money32 * outValue)
{
bool vertical = (sprite->vertical != 0);
rct_string_id spentStringId = vertical ? STR_MONEY_EFFECT_SPEND_HIGHP : STR_MONEY_EFFECT_SPEND;
@ -137,5 +137,6 @@ rct_string_id money_effect_get_string_id(const rct_money_effect * sprite)
value *= -1;
stringId = spentStringId;
}
if (outValue != NULL) *outValue = value;
return stringId;
}

2
src/openrct2/world/sprite.h
View File

@ -463,7 +463,7 @@ uint32 duck_get_frame_image(const rct_duck * duck, sint32 direction);
void money_effect_create(money32 value);
void money_effect_create_at(money32 value, sint32 x, sint32 y, sint32 z, bool vertical);
void money_effect_update(rct_money_effect *moneyEffect);
rct_string_id money_effect_get_string_id(const rct_money_effect * sprite);
rct_string_id money_effect_get_string_id(const rct_money_effect * sprite, money32 * outValue);
///////////////////////////////////////////////////////////////
// Crash particles