From 6bd050e2015af3d556340d6e4d4fed62006c5c42 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 3 Aug 2020 15:05:38 +1000
Subject: [PATCH] - fix some interpolation harshness with `p->weapon_pos`.

---
 source/games/duke/src/player_d.cpp | 4 ++--
 source/games/duke/src/premap.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index b33edd79c..72e39f6a0 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -2122,7 +2122,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
 			{
 				p->curr_weapon = HANDREMOTE_WEAPON;
 				p->last_weapon = -1;
-				p->weapon_pos = 10;
+				p->oweapon_pos = p->weapon_pos = 10;
 			}
 		}
 
@@ -2459,7 +2459,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
 		{
 			p->okickback_pic = p->kickback_pic = 0;
 			checkavailweapon(p);
-			p->weapon_pos = -9;
+			p->oweapon_pos = p->weapon_pos = -9;
 		}
 		else p->kickback_pic++;
 		break;
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index b157b616e..e0705fe9d 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -161,7 +161,7 @@ void resetplayerstats(int snum)
         p->okickback_pic = p->kickback_pic  = isRR()? 22 : 5;
     else p->okickback_pic = p->kickback_pic = 0;
 
-    p->weapon_pos        = 6;
+    p->oweapon_pos = p->weapon_pos        = 6;
     p->walking_snd_toggle= 0;
     p->weapon_ang        = 0;
 
@@ -273,7 +273,7 @@ void resetweapons(int snum)
     }
 
     p->gotweapon.Zero();
-    p->weapon_pos = 6;
+    p->oweapon_pos = p->weapon_pos = 6;
     p->okickback_pic = p->kickback_pic = 5;
     p->curr_weapon = PISTOL_WEAPON;
     p->gotweapon.Set(PISTOL_WEAPON);
@@ -400,7 +400,7 @@ void resetprestat(int snum,int g)
     p->actors_killed     = 0;
     p->max_actors_killed = 0;
     p->lastrandomspot = 0;
-    p->weapon_pos = 6;
+    p->oweapon_pos = p->weapon_pos = 6;
     p->okickback_pic = p->kickback_pic = 5;
     p->last_weapon = -1;
     p->weapreccnt = 0;