From f6dae982a6774d7129ad74e5bbe0691f3db59239 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 21 Jun 2020 14:18:00 -0300 Subject: [PATCH] Make MoneyEffect::CreateAt use CoordsXYZ --- src/openrct2/peep/Guest.cpp | 2 +- src/openrct2/world/MoneyEffect.cpp | 6 +++--- src/openrct2/world/Sprite.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index afc5da8c3a..410a2ba406 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -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); } } diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index 0f723d6b52..355ae5ce11 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -27,7 +27,7 @@ template<> bool SpriteBase::Is() 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); } /** diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index 815e885736..b8145a8cf7 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -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 GetStringId() const;