From 0b7ad34c9d2d72a627b165362f1a3203e4e22eee Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sun, 3 Jul 2022 21:17:07 +0200
Subject: [PATCH] Take player by reference in StartWalkStand and
 RemovePlrMissiles (#4874)

---
 Source/multi.cpp  |  2 +-
 Source/player.cpp | 19 +++++++------------
 Source/player.h   |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Source/multi.cpp b/Source/multi.cpp
index 03a0aa359..27f5d7854 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -241,7 +241,7 @@ void PlayerLeftMsg(int pnum, bool left)
 	RemovePortalMissile(pnum);
 	DeactivatePortal(pnum);
 	delta_close_portal(pnum);
-	RemovePlrMissiles(pnum);
+	RemovePlrMissiles(player);
 	if (left) {
 		string_view pszFmt = _("Player '{:s}' just left the game");
 		switch (sgdwPlayerLeftReasonTbl[pnum]) {
diff --git a/Source/player.cpp b/Source/player.cpp
index f218de7ac..a05c70d0d 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -390,18 +390,13 @@ void ClearStateVariables(Player &player)
 	player.position.offset2 = { 0, 0 };
 }
 
-void StartWalkStand(int pnum)
+void StartWalkStand(Player &player)
 {
-	if ((DWORD)pnum >= MAX_PLRS) {
-		app_fatal(fmt::format("StartWalkStand: illegal player {}", pnum));
-	}
-	Player &player = Players[pnum];
-
 	player._pmode = PM_STAND;
 	player.position.future = player.position.tile;
 	player.position.offset = { 0, 0 };
 
-	if (pnum == MyPlayerId) {
+	if (&player == MyPlayer) {
 		ScrollInfo.offset = { 0, 0 };
 		ScrollInfo._sdir = ScrollDirection::None;
 		ViewPosition = player.position.tile;
@@ -616,7 +611,7 @@ void InitLevelChange(int pnum)
 	Player &player = Players[pnum];
 	Player &myPlayer = *MyPlayer;
 
-	RemovePlrMissiles(pnum);
+	RemovePlrMissiles(player);
 	player.pManaShield = false;
 	player.wReflections = 0;
 	// share info about your manashield when another player joins the level
@@ -698,7 +693,7 @@ bool DoWalk(int pnum, int variant)
 		}
 
 		if (player.walkpath[0] != WALK_NONE) {
-			StartWalkStand(pnum);
+			StartWalkStand(player);
 		} else {
 			StartStand(pnum, player.tempDirection);
 		}
@@ -3187,9 +3182,9 @@ void SyncPlrKill(int pnum, int earflag)
 	StartPlayerKill(pnum, earflag);
 }
 
-void RemovePlrMissiles(int pnum)
+void RemovePlrMissiles(const Player &player)
 {
-	if (leveltype != DTYPE_TOWN && pnum == MyPlayerId) {
+	if (leveltype != DTYPE_TOWN && &player == MyPlayer) {
 		auto &golem = Monsters[MyPlayerId];
 		if (golem.position.tile.x != 1 || golem.position.tile.y != 0) {
 			M_StartKill(MyPlayerId, MyPlayerId);
@@ -3203,7 +3198,7 @@ void RemovePlrMissiles(int pnum)
 	}
 
 	for (auto &missile : Missiles) {
-		if (missile._mitype == MIS_STONE && missile._misource == pnum) {
+		if (missile._mitype == MIS_STONE && &Players[missile._misource] == &player) {
 			Monsters[missile.var2]._mmode = static_cast<MonsterMode>(missile.var1);
 		}
 	}
diff --git a/Source/player.h b/Source/player.h
index ded415608..71862c0ae 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -787,7 +787,7 @@ void StartPlayerKill(int pnum, int earflag);
  */
 void StripTopGold(Player &player);
 void SyncPlrKill(int pnum, int earflag);
-void RemovePlrMissiles(int pnum);
+void RemovePlrMissiles(const Player &player);
 void StartNewLvl(int pnum, interface_mode fom, int lvl);
 void RestartTownLvl(int pnum);
 void StartWarpLvl(int pnum, int pidx);