MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

♻️ Leverage 'Point' in 'DrawPlayerIcons' function

Browse source
This commit is contained in:
Juliano Leal Goncalves 2021-06-27 23:23:09 -03:00 • committed by Anders Jenbo
commit 66c8bb68af
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/scrollrt.cpp
View file

@ -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;
}