From 079df4dd8f21efc62b47525a74ae8c4db6b8bcb8 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 3 Oct 2023 22:29:33 +1100
Subject: [PATCH] - Duke: Clean up player/actor accesses in `makepainsounds()`.

---
 source/games/duke/src/funct.h      | 2 +-
 source/games/duke/src/player.cpp   | 3 +--
 source/games/duke/src/player_d.cpp | 2 +-
 source/games/duke/src/player_r.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h
index ba69a9bf2..e4ae52c72 100644
--- a/source/games/duke/src/funct.h
+++ b/source/games/duke/src/funct.h
@@ -102,7 +102,7 @@ void dokneeattack(DDukePlayer* const p);
 int endoflevel(int snum);
 void playerisdead(int snum, int psectlotag, double fz, double cz);
 void footprints(int snum);
-int makepainsounds(int snum, int type);
+int makepainsounds(DDukePlayer* const p, int type);
 void playerCrouch(int snum);
 void playerJump(int snum, double fz, double cz);
 
diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp
index e67330e27..9e4729551 100644
--- a/source/games/duke/src/player.cpp
+++ b/source/games/duke/src/player.cpp
@@ -412,9 +412,8 @@ void dokneeattack(DDukePlayer* const p)
 //
 //---------------------------------------------------------------------------
 
-int makepainsounds(int snum, int type)
+int makepainsounds(DDukePlayer* const p, int type)
 {
-	auto p = getPlayer(snum);
 	auto actor = p->GetActor();
 	int k = 0;
 
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index f998c62f1..b8b909f71 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -1728,7 +1728,7 @@ void processinput_d(int snum)
 		{
 			int surface = tilesurface(sect->floortexture);
 			int whichsound = surface == TSURF_ELECTRIC? 0 : surface == TSURF_SLIME? 1 : surface == TSURF_PLASMA? 2 : -1;
-			k = makepainsounds(snum, whichsound);
+			k = makepainsounds(p, whichsound);
 		}
 
 		if (k)
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 7f4ecfea1..da9b714f7 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -2555,7 +2555,7 @@ void processinput_r(int snum)
 		{
 			int surface = tilesurface(sect->floortexture);
 			int whichsound = surface == TSURF_ELECTRIC ? 0 : surface == TSURF_SLIME ? 1 : surface == TSURF_PLASMA ? 2 : surface == TSURF_MAGMA ? 3 : -1;
-			k = makepainsounds(snum, whichsound);
+			k = makepainsounds(p, whichsound);
 		}
 
 		if (k)