diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index b030584e4..eb05509f5 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -170,16 +170,16 @@ void checkavailweapon(struct player_struct* p)
 	p->curr_weapon = weap;
 	if (isWW2GI())
 	{
-		SetGameVarID(g_iWeaponVarID, p->curr_weapon, snum, p->i);
+		SetGameVarID(g_iWeaponVarID, p->curr_weapon, p->i, snum); // snum is playerindex!
 		if (p->curr_weapon >= 0)
 		{
-			SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike[p->curr_weapon][snum], snum, p->i);
+			SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
 		}
 		else
 		{
-			SetGameVarID(g_iWorksLikeVarID, -1, snum, p->i);
+			SetGameVarID(g_iWorksLikeVarID, -1, p->i, snum);
 		}
-		OnEvent(EVENT_CHANGEWEAPON, p->i, snum, -1);
+		OnEvent(EVENT_CHANGEWEAPON, snum, p->i, -1);
 	}
 
 	p->okickback_pic = p->kickback_pic = 0;
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 8cd29a3e5..99594643e 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -469,7 +469,7 @@ static void shootstuff(int i, int p, int sx, int sy, int sz, int sa, int atwith)
 	spritetype* const s = &sprite[i];
 	int sect = s->sectnum;
 	int vel, zvel;
-	short l, j, scount;
+	short j, scount;
 
 	if (isRRRA())
 	{
@@ -764,7 +764,7 @@ static void shootwhip(int i, int p, int sx, int sy, int sz, int sa, int atwith)
 	spritetype* const s = &sprite[i];
 	int sect = s->sectnum;
 	int vel, zvel;
-	short l, j, scount;
+	short j, scount;
 
 	if (s->extra >= 0) s->shade = -96;
 
@@ -837,9 +837,8 @@ static void shootwhip(int i, int p, int sx, int sy, int sz, int sa, int atwith)
 
 void shoot_r(int i, int atwith)
 {
-	short sect, hitsect, hitspr, hitwall, l, sa, p, j, k, scount;
-	int sx, sy, sz, vel, zvel, hitx, hity, hitz, x, oldzvel, dal;
-	uint8_t sizx, sizy;
+	short sect, sa, p, j;
+	int sx, sy, sz, vel, zvel, x;
 	spritetype* s;
 
 	s = &sprite[i];