From 66c8bb68afe6fe2b9452397794087da8dafff096 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Sun, 27 Jun 2021 23:23:09 -0300 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Leverage=20'Point'=20in=20?= =?UTF-8?q?'DrawPlayerIcons'=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/scrollrt.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index d8bf58df0..87476254c 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -476,17 +476,16 @@ void DrawPlayerIconHelper(const Surface &out, int pnum, missile_graphic_id missi * @brief Helper for rendering player icons (Mana Shield and Reflect) * @param out Output buffer * @param pnum Player id - * @param sx Output buffer coordinate - * @param sy Output buffer coordinate + * @param position Output buffer coordinates * @param lighting Should lighting be applied */ -void DrawPlayerIcons(const Surface &out, int pnum, int x, int y, bool lighting) +void DrawPlayerIcons(const Surface &out, int pnum, Point position, bool lighting) { auto &player = Players[pnum]; if (player.pManaShield) - DrawPlayerIconHelper(out, pnum, MFILE_MANASHLD, x, y, lighting); + DrawPlayerIconHelper(out, pnum, MFILE_MANASHLD, position.x, position.y, lighting); if (player.wReflections > 0) - DrawPlayerIconHelper(out, pnum, MFILE_REFLECT, x, y + 16, lighting); + DrawPlayerIconHelper(out, pnum, MFILE_REFLECT, position.x, position.y + 16, lighting); } /** @@ -536,13 +535,13 @@ void DrawPlayer(const Surface &out, int pnum, Point tilePosition, Point targetBu if (pnum == MyPlayerId) { Cl2Draw(out, targetBufferPosition.x, targetBufferPosition.y, *pCelSprite, nCel); - DrawPlayerIcons(out, pnum, targetBufferPosition.x, targetBufferPosition.y, true); + DrawPlayerIcons(out, pnum, targetBufferPosition, true); return; } if ((dFlags[tilePosition.x][tilePosition.y] & BFLAG_LIT) == 0 || (Players[MyPlayerId]._pInfraFlag && LightTableIndex > 8)) { Cl2DrawLightTbl(out, targetBufferPosition.x, targetBufferPosition.y, *pCelSprite, nCel, 1); - DrawPlayerIcons(out, pnum, targetBufferPosition.x, targetBufferPosition.y, true); + DrawPlayerIcons(out, pnum, targetBufferPosition, true); return; } @@ -553,7 +552,7 @@ void DrawPlayer(const Surface &out, int pnum, Point tilePosition, Point targetBu LightTableIndex -= 5; Cl2DrawLight(out, targetBufferPosition.x, targetBufferPosition.y, *pCelSprite, nCel); - DrawPlayerIcons(out, pnum, targetBufferPosition.x, targetBufferPosition.y, false); + DrawPlayerIcons(out, pnum, targetBufferPosition, false); LightTableIndex = l; }