From 11a6be073c2738b4bb7cf552fefd9936389770f6 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Sun, 27 Jun 2021 23:24:46 -0300 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Leverage=20'Point'=20in=20?= =?UTF-8?q?'DrawPlayerIconHelper'=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/scrollrt.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index 87476254c..2f7f225b0 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -450,9 +450,9 @@ void DrawMonster(const Surface &out, int x, int y, int mx, int my, const Monster /** * @brief Helper for rendering a specific player icon (Mana Shield or Reflect) */ -void DrawPlayerIconHelper(const Surface &out, int pnum, missile_graphic_id missileGraphicId, int x, int y, bool lighting) +void DrawPlayerIconHelper(const Surface &out, int pnum, missile_graphic_id missileGraphicId, Point position, bool lighting) { - x += CalculateWidth2(Players[pnum].AnimInfo.pCelSprite->Width()) - MissileSpriteData[missileGraphicId].animWidth2; + position.x += CalculateWidth2(Players[pnum].AnimInfo.pCelSprite->Width()) - MissileSpriteData[missileGraphicId].animWidth2; int width = MissileSpriteData[missileGraphicId].animWidth; byte *pCelBuff = MissileSpriteData[missileGraphicId].animData[0].get(); @@ -460,16 +460,16 @@ void DrawPlayerIconHelper(const Surface &out, int pnum, missile_graphic_id missi CelSprite cel { pCelBuff, width }; if (pnum == MyPlayerId) { - Cl2Draw(out, x, y, cel, 1); + Cl2Draw(out, position.x, position.y, cel, 1); return; } if (lighting) { - Cl2DrawLightTbl(out, x, y, cel, 1, 1); + Cl2DrawLightTbl(out, position.x, position.y, cel, 1, 1); return; } - Cl2DrawLight(out, x, y, cel, 1); + Cl2DrawLight(out, position.x, position.y, cel, 1); } /** @@ -483,9 +483,9 @@ void DrawPlayerIcons(const Surface &out, int pnum, Point position, bool lighting { auto &player = Players[pnum]; if (player.pManaShield) - DrawPlayerIconHelper(out, pnum, MFILE_MANASHLD, position.x, position.y, lighting); + DrawPlayerIconHelper(out, pnum, MFILE_MANASHLD, position, lighting); if (player.wReflections > 0) - DrawPlayerIconHelper(out, pnum, MFILE_REFLECT, position.x, position.y + 16, lighting); + DrawPlayerIconHelper(out, pnum, MFILE_REFLECT, position + Displacement { 0, 16 }, lighting); } /**