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

Make MoneyEffect::CreateAt use CoordsXYZ

Browse Source
This commit is contained in:
Tulio Leao
2020-06-21 14:18:00 -03:00
parent 3c75481d8a
commit f6dae982a6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/peep/Guest.cpp
View File

@@ -2357,7 +2357,7 @@ void Guest::SpendMoney(money16& peep_expend_type, money32 amount, ExpenditureTyp
// needing to be synchronised
if (network_get_mode() == NETWORK_MODE_NONE && !gOpenRCT2Headless)
{
MoneyEffect::CreateAt(amount, x, y, z, true);
MoneyEffect::CreateAt(amount, { x, y, z }, true);
}
}

6
src/openrct2/world/MoneyEffect.cpp
View File

@@ -27,7 +27,7 @@ template<> bool SpriteBase::Is<MoneyEffect>() const
*
* rct2: 0x0067351F
*/
void MoneyEffect::CreateAt(money32 value, int32_t x, int32_t y, int32_t z, bool vertical)
void MoneyEffect::CreateAt(money32 value, const CoordsXYZ& effectPos, bool vertical)
{
if (value == MONEY(0, 00))
return;
@@ -42,7 +42,7 @@ void MoneyEffect::CreateAt(money32 value, int32_t x, int32_t y, int32_t z, bool
moneyEffect->sprite_height_negative = 20;
moneyEffect->sprite_height_positive = 30;
moneyEffect->sprite_identifier = SPRITE_IDENTIFIER_MISC;
moneyEffect->MoveTo({ x, y, z });
moneyEffect->MoveTo(effectPos);
moneyEffect->type = SPRITE_MISC_MONEY_EFFECT;
moneyEffect->NumMovements = 0;
moneyEffect->MoveDelay = 0;
@@ -89,7 +89,7 @@ void MoneyEffect::Create(money32 value, CoordsXYZ loc)
loc = { *mapPositionXY, tile_element_height(*mapPositionXY) };
}
loc.z += 10;
CreateAt(-value, loc.x, loc.y, loc.z, false);
CreateAt(-value, loc, false);
}
/**

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

@@ -81,7 +81,7 @@ struct MoneyEffect : SpriteBase
int16_t OffsetX;
uint16_t Wiggle;
static void CreateAt(money32 value, int32_t x, int32_t y, int32_t z, bool vertical);
static void CreateAt(money32 value, const CoordsXYZ& effectPos, bool vertical);
static void Create(money32 value, CoordsXYZ loc);
void Update();
std::pair<rct_string_id, money32> GetStringId() const;