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

Rename player globals

Browse source
This commit is contained in:
Anders Jenbo 2021-07-07 02:15:00 +02:00
commit 96bf75b502
46 changed files with 1615 additions and 1615 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/debug.cpp
View file

@ -53,7 +53,7 @@ void CheckDungeonClear()
void GiveGoldCheat()
{
auto &myPlayer = plr[myplr];
auto &myPlayer = Players[MyPlayerId];
for (int8_t &itemId : myPlayer.InvGrid) {
if (itemId != 0)
@ -71,7 +71,7 @@ void GiveGoldCheat()
void TakeGoldCheat()
{
auto &myPlayer = plr[myplr];
auto &myPlayer = Players[MyPlayerId];
for (auto itemId : myPlayer.InvGrid) {
itemId -= 1;
@ -89,7 +89,7 @@ void TakeGoldCheat()
void MaxSpellsCheat()
{
auto &myPlayer = plr[myplr];
auto &myPlayer = Players[MyPlayerId];
for (int i = SPL_FIREBOLT; i < MAX_SPELLS; i++) {
if (GetSpellBookLevel((spell_id)i) != -1) {
@ -101,7 +101,7 @@ void MaxSpellsCheat()
void SetSpellLevelCheat(spell_id spl, int spllvl)
{
auto &myPlayer = plr[myplr];
auto &myPlayer = Players[MyPlayerId];
myPlayer._pMemSpells |= GetSpellBitmask(spl);
myPlayer._pSplLvl[spl] = spllvl;
@ -142,23 +142,23 @@ void PrintDebugPlayer(bool bNextPlayer)
if (bNextPlayer)
DebugPlayerId = ((BYTE)DebugPlayerId + 1) & 3;
auto &player = plr[DebugPlayerId];
auto &player = Players[DebugPlayerId];
sprintf(dstr, "Plr %i : Active = %i", DebugPlayerId, player.plractive ? 1 : 0);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
if (player.plractive) {
sprintf(dstr, " Plr %i is %s", DebugPlayerId, player._pName);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, " Lvl = %i : Change = %i", player.plrlevel, player._pLvlChanging ? 1 : 0);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
const Point target = player.GetTargetPosition();
sprintf(dstr, " x = %i, y = %i : tx = %i, ty = %i", player.position.tile.x, player.position.tile.y, target.x, target.y);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, " mode = %i : daction = %i : walk[0] = %i", player._pmode, player.destAction, player.walkpath[0]);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, " inv = %i : hp = %i", player._pInvincible ? 1 : 0, player._pHitPoints);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
}
}
@ -169,7 +169,7 @@ void PrintDebugQuest()
char dstr[128];
sprintf(dstr, "Quest %i : Active = %i, Var1 = %i", DebugQuestId, quests[DebugQuestId]._qactive, quests[DebugQuestId]._qvar1);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
DebugQuestId++;
if (DebugQuestId == MAXQUESTS)
@ -183,13 +183,13 @@ void PrintDebugMonster(int m)
char dstr[128];
sprintf(dstr, "Monster %i = %s", m, _(Monsters[m].mName));
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, "X = %i, Y = %i", Monsters[m].position.tile.x, Monsters[m].position.tile.y);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, "Enemy = %i, HP = %i", Monsters[m]._menemy, Monsters[m]._mhitpoints);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, "Mode = %i, Var1 = %i", Monsters[m]._mmode, Monsters[m]._mVar1);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
bActive = false;
@ -199,7 +199,7 @@ void PrintDebugMonster(int m)
}
sprintf(dstr, "Active List = %i, Squelch = %i", bActive ? 1 : 0, Monsters[m]._msquelch);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
}
int DebugMonsterId;
@ -229,7 +229,7 @@ void NextDebugMonster()
DebugMonsterId = 0;
sprintf(dstr, "Current debug monster = %i", DebugMonsterId);
NetSendCmdString(1 << myplr, dstr);
NetSendCmdString(1 << MyPlayerId, dstr);
}
#endif