diff --git a/source/games/duke/src/dispatch.cpp b/source/games/duke/src/dispatch.cpp
index f5fcdecba..563437391 100644
--- a/source/games/duke/src/dispatch.cpp
+++ b/source/games/duke/src/dispatch.cpp
@@ -53,8 +53,8 @@ void checkweapons_d(DDukePlayer* p);
 void checkweapons_r(DDukePlayer* p);
 void processinput_d(int snum);
 void processinput_r(int snum);
-void displayweapon_d(int snum, double interpfrac);
-void displayweapon_r(int snum, double interpfrac);
+void displayweapon_d(DDukePlayer* const p, double interpfrac);
+void displayweapon_r(DDukePlayer* const p, double interpfrac);
 void displaymasks_d(DDukePlayer* const p, int pal, double interpfrac);
 void displaymasks_r(DDukePlayer* const p, int pal, double interpfrac);
 void think_d();
diff --git a/source/games/duke/src/duke3d.h b/source/games/duke/src/duke3d.h
index 909502f14..c93792643 100644
--- a/source/games/duke/src/duke3d.h
+++ b/source/games/duke/src/duke3d.h
@@ -83,7 +83,7 @@ struct Dispatcher
 	int (*doincrements)(DDukePlayer* p);
 	void (*checkweapons)(DDukePlayer* p);
 	void (*processinput)(int snum);
-	void (*displayweapon)(int snum, double interpfrac);
+	void (*displayweapon)(DDukePlayer* const p, double interpfrac);
 	void (*displaymasks)(DDukePlayer* const p, int pal, double interpfrac);
 
 	void (*animatesprites)(tspriteArray& tsprites, const DVector2& viewVec, DAngle viewang, double interpfrac);
diff --git a/source/games/duke/src/game_misc.cpp b/source/games/duke/src/game_misc.cpp
index 8541e1827..cc2336c78 100644
--- a/source/games/duke/src/game_misc.cpp
+++ b/source/games/duke/src/game_misc.cpp
@@ -196,7 +196,7 @@ void V_AddBlend (float r, float g, float b, float a, float v_blend[4])
 		 cameratext(pp->newOwner);
 	 else
 	 {
-		 fi.displayweapon(screenpeek, interpfrac);
+		 fi.displayweapon(pp, interpfrac);
 		 if (pp->over_shoulder_on == 0)
 			 fi.displaymasks(pp, pp->GetActor()->spr.pal == 1 || !pp->insector() ? 1 : pp->cursector->floorpal, interpfrac);
 	 }
diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp
index 2af5bc7ee..68aee770f 100644
--- a/source/games/duke/src/hudweapon_d.cpp
+++ b/source/games/duke/src/hudweapon_d.cpp
@@ -217,10 +217,9 @@ void animateshrunken(DDukePlayer* p, double xoffset, double yoffset, int8_t shad
 //
 //---------------------------------------------------------------------------
 
-void displayweapon_d(int snum, double interpfrac)
+void displayweapon_d(DDukePlayer* const p, double interpfrac)
 {
 	int pal, pal2;
-	DDukePlayer* p = getPlayer(snum);
 
 	if (p->newOwner != nullptr || ud.cameraactor != nullptr || p->over_shoulder_on > 0 || (p->GetActor()->spr.pal != 1 && p->GetActor()->spr.extra <= 0))
 		return;
diff --git a/source/games/duke/src/hudweapon_r.cpp b/source/games/duke/src/hudweapon_r.cpp
index a0be8d775..fb7a5aa93 100644
--- a/source/games/duke/src/hudweapon_r.cpp
+++ b/source/games/duke/src/hudweapon_r.cpp
@@ -210,12 +210,11 @@ void DrawBoat(int const kb, const DVector2& offsets, DAngle angle, int shade, in
 //---------------------------------------------------------------------------
 void animateshrunken(DDukePlayer* p, double xoffset, double yoffset, int8_t shade, int o, double interpfrac);
 
-void displayweapon_r(int snum, double interpfrac)
+void displayweapon_r(DDukePlayer* const p, double interpfrac)
 {
 	double weapon_sway, gun_pos, hard_landing;
 	DAngle TiltStatus;
 
-	auto p = getPlayer(snum);
 	auto kb = &p->kickback_pic;
 
 	int o = 0;