code cleanup (#3235)

Source/items.cpp

@@ -4219,9 +4219,9 @@ void PrintItemDur(Item *x)
 	PrintItemInfo(*x);
 }
 
-void UseItem(int p, item_misc_id mid, spell_id spl)
+void UseItem(int pnum, item_misc_id mid, spell_id spl)
 {
-	auto &player = Players[p];
+	auto &player = Players[pnum];
 
 	switch (mid) {
 	case IMISC_HEAL:
@@ -4262,10 +4262,10 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 		}
 		break;
 	case IMISC_ELIXSTR:
-		ModifyPlrStr(p, 1);
+		ModifyPlrStr(pnum, 1);
 		break;
 	case IMISC_ELIXMAG:
-		ModifyPlrMag(p, 1);
+		ModifyPlrMag(pnum, 1);
 		if (gbIsHellfire) {
 			player._pMana = player._pMaxMana;
 			player._pManaBase = player._pMaxManaBase;
@@ -4273,10 +4273,10 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 		}
 		break;
 	case IMISC_ELIXDEX:
-		ModifyPlrDex(p, 1);
+		ModifyPlrDex(pnum, 1);
 		break;
 	case IMISC_ELIXVIT:
-		ModifyPlrVit(p, 1);
+		ModifyPlrVit(pnum, 1);
 		if (gbIsHellfire) {
 			player._pHitPoints = player._pMaxHP;
 			player._pHPBase = player._pMaxHPBase;
@@ -4318,7 +4318,7 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 	case IMISC_SCROLL:
 		if (spelldata[spl].sTargeted) {
 			player._pTSpell = spl;
-			if (p == MyPlayerId)
+			if (pnum == MyPlayerId)
 				NewCursor(CURSOR_TELEPORT);
 		} else {
 			ClrPlrPath(player);
@@ -4328,14 +4328,14 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 			player.destAction = ACTION_SPELL;
 			player.destParam1 = cursPosition.x;
 			player.destParam2 = cursPosition.y;
-			if (p == MyPlayerId && spl == SPL_NOVA)
-				NetSendCmdLoc(MyPlayerId, true, CMD_NOVA, cursPosition);
+			if (pnum == MyPlayerId && spl == SPL_NOVA)
+				NetSendCmdLoc(pnum, true, CMD_NOVA, cursPosition);
 		}
 		break;
 	case IMISC_SCROLLT:
 		if (spelldata[spl].sTargeted) {
 			player._pTSpell = spl;
-			if (p == MyPlayerId)
+			if (pnum == MyPlayerId)
 				NewCursor(CURSOR_TELEPORT);
 		} else {
 			ClrPlrPath(player);
@@ -4357,7 +4357,7 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 			player._pManaBase += spelldata[spl].sManaCost << 6;
 			player._pManaBase = std::min(player._pManaBase, player._pMaxManaBase);
 		}
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			CalcPlrBookVals(player);
 		drawmanaflag = true;
 		break;
@@ -4375,7 +4375,7 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 	case IMISC_OILHARD:
 	case IMISC_OILIMP:
 		player._pOilType = mid;
-		if (p != MyPlayerId) {
+		if (pnum != MyPlayerId) {
 			return;
 		}
 		if (sbookflag) {
@@ -4387,34 +4387,34 @@ void UseItem(int p, item_misc_id mid, spell_id spl)
 		NewCursor(CURSOR_OIL);
 		break;
 	case IMISC_SPECELIX:
-		ModifyPlrStr(p, 3);
-		ModifyPlrMag(p, 3);
-		ModifyPlrDex(p, 3);
-		ModifyPlrVit(p, 3);
+		ModifyPlrStr(pnum, 3);
+		ModifyPlrMag(pnum, 3);
+		ModifyPlrDex(pnum, 3);
+		ModifyPlrVit(pnum, 3);
 		break;
 	case IMISC_RUNEF:
 		player._pTSpell = SPL_RUNEFIRE;
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			NewCursor(CURSOR_TELEPORT);
 		break;
 	case IMISC_RUNEL:
 		player._pTSpell = SPL_RUNELIGHT;
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			NewCursor(CURSOR_TELEPORT);
 		break;
 	case IMISC_GR_RUNEL:
 		player._pTSpell = SPL_RUNENOVA;
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			NewCursor(CURSOR_TELEPORT);
 		break;
 	case IMISC_GR_RUNEF:
 		player._pTSpell = SPL_RUNEIMMOLAT;
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			NewCursor(CURSOR_TELEPORT);
 		break;
 	case IMISC_RUNES:
 		player._pTSpell = SPL_RUNESTONE;
-		if (p == MyPlayerId)
+		if (pnum == MyPlayerId)
 			NewCursor(CURSOR_TELEPORT);
 		break;
 	default:

Source/msg.cpp

@@ -1477,8 +1477,8 @@ DWORD OnPlayerDamage(const TCmd *pCmd, Player &player)
 	const auto &message = *reinterpret_cast<const TCmdDamage *>(pCmd);
 
 	if (message.bPlr == MyPlayerId && currlevel != 0 && gbBufferMsgs != 1) {
-		if (currlevel == player.plrlevel && message.dwDam <= 192000 && Players[MyPlayerId]._pHitPoints >> 6 > 0) {
-			ApplyPlrDamage(MyPlayerId, 0, 0, message.dwDam, 1);
+		if (currlevel == player.plrlevel && message.dwDam <= 192000 && Players[message.bPlr]._pHitPoints >> 6 > 0) {
+			ApplyPlrDamage(message.bPlr, 0, 0, message.dwDam, 1);
 		}
 	}
 

Source/objects.cpp

@@ -2406,7 +2406,7 @@ void OperateMushPatch(int pnum, int i)
 
 	if (Quests[Q_MUSHROOM]._qactive != QUEST_ACTIVE) {
 		if (!deltaload && pnum == MyPlayerId) {
-			Players[MyPlayerId].Say(HeroSpeech::ICantUseThisYet);
+			Players[pnum].Say(HeroSpeech::ICantUseThisYet);
 		}
 		return;
 	}
@@ -2432,7 +2432,7 @@ void OperateInnSignChest(int pnum, int i)
 
 	if (Quests[Q_LTBANNER]._qvar1 != 2) {
 		if (!deltaload && pnum == MyPlayerId) {
-			Players[MyPlayerId].Say(HeroSpeech::ICantOpenThisYet);
+			Players[pnum].Say(HeroSpeech::ICantOpenThisYet);
 		}
 		return;
 	}

Source/player.cpp

@@ -682,7 +682,7 @@ void InitLevelChange(int pnum)
 	RemovePlrFromMap(pnum);
 	SetPlayerOld(player);
 	if (pnum == MyPlayerId) {
-		dPlayer[myPlayer.position.tile.x][myPlayer.position.tile.y] = MyPlayerId + 1;
+		dPlayer[player.position.tile.x][player.position.tile.y] = pnum + 1;
 	} else {
 		player._pLvlVisited[player.plrlevel] = true;
 	}
@@ -1759,7 +1759,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
 				x = abs(player.position.tile.x - item->position.x);
 				y = abs(player.position.tile.y - item->position.y);
 				if (x <= 1 && y <= 1 && pcurs == CURSOR_HAND && !item->_iRequest) {
-					NetSendCmdGItem(true, CMD_REQUESTGITEM, MyPlayerId, MyPlayerId, targetId);
+					NetSendCmdGItem(true, CMD_REQUESTGITEM, pnum, pnum, targetId);
 					item->_iRequest = true;
 				}
 			}
@@ -1769,7 +1769,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
 				x = abs(player.position.tile.x - item->position.x);
 				y = abs(player.position.tile.y - item->position.y);
 				if (x <= 1 && y <= 1 && pcurs == CURSOR_HAND) {
-					NetSendCmdGItem(true, CMD_REQUESTAGITEM, MyPlayerId, MyPlayerId, targetId);
+					NetSendCmdGItem(true, CMD_REQUESTAGITEM, pnum, pnum, targetId);
 				}
 			}
 			break;
@@ -2742,7 +2742,7 @@ void InitPlayer(Player &player, bool firstTime)
 
 		if (&player == &myPlayer) {
 			player._plid = AddLight(player.position.tile, player._pLightRad);
-			ChangeLightXY(myPlayer._plid, myPlayer.position.tile); // fix for a bug where old light is still visible at the entrance after reentering level
+			ChangeLightXY(player._plid, player.position.tile); // fix for a bug where old light is still visible at the entrance after reentering level
 		} else {
 			player._plid = NO_LIGHT;
 		}