From 99486cba7e7d802ee4f7df9e69c6ac17edb48630 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 27 Aug 2020 00:21:11 +0200
Subject: [PATCH] - gave Blood the same treatment.

---
 source/blood/src/blood.cpp    | 4 ++--
 source/blood/src/controls.cpp | 2 +-
 source/blood/src/player.cpp   | 2 +-
 source/core/packet.h          | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 35aa17956..0261066bb 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -527,8 +527,8 @@ void ProcessFrame(void)
     {
         gPlayer[i].input.syncFlags.value &= ~flag_buttonmask;
         gPlayer[i].input.syncFlags.value |= gFifoInput[gNetFifoTail & 255][i].syncFlags.value;
-        if (gFifoInput[gNetFifoTail&255][i].syncFlags.newWeapon)
-            gPlayer[i].newWeapon = gFifoInput[gNetFifoTail&255][i].syncFlags.newWeapon;
+        int newweap = gFifoInput[gNetFifoTail & 255][i].getNewWeapon();
+        if (newweap) gPlayer[i].newWeapon = newweap;
         gPlayer[i].input.fvel = gFifoInput[gNetFifoTail&255][i].fvel;
         gPlayer[i].input.q16avel = gFifoInput[gNetFifoTail&255][i].q16avel;
         gPlayer[i].input.svel = gFifoInput[gNetFifoTail&255][i].svel;
diff --git a/source/blood/src/controls.cpp b/source/blood/src/controls.cpp
index 384c515ef..ca622d62c 100644
--- a/source/blood/src/controls.cpp
+++ b/source/blood/src/controls.cpp
@@ -151,7 +151,7 @@ void ctrlGetInput(void)
 
     gInput.syncFlags.value |= BitsToSend.value;
     if (WeaponToSend != 0) 
-        gInput.syncFlags.newWeapon = WeaponToSend;
+        gInput.SetNewWeapon(WeaponToSend);
 
     BitsToSend.value = 0;
     WeaponToSend = 0;
diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp
index fc88c07d7..d277249a8 100644
--- a/source/blood/src/player.cpp
+++ b/source/blood/src/player.cpp
@@ -1331,7 +1331,7 @@ void ProcessInput(PLAYER *pPlayer)
                 pPlayer->q16horiz = mulscale16(0x8000-(Cos(ClipHigh(pPlayer->deathTime*8, 1024))>>15), fix16_from_int(120));
         }
         if (pPlayer->curWeapon)
-            pInput->syncFlags.newWeapon = pPlayer->curWeapon;
+            pInput->SetNewWeapon(pPlayer->curWeapon);
         if (pInput->syncFlags.action)
         {
             if (bSeqStat)
diff --git a/source/core/packet.h b/source/core/packet.h
index 4c8156d19..431434c6b 100644
--- a/source/core/packet.h
+++ b/source/core/packet.h
@@ -37,7 +37,6 @@ enum EDukeSyncBits_ : uint32_t
 	SKB_RUN = 1 << 5,
 	SKB_LOOK_LEFT = 1 << 6,
 	SKB_LOOK_RIGHT = 1 << 7,
-	SKB_FIRST_WEAPON_BIT = 1 << 8,
 	SKB_STEROIDS = 1 << 12,
 	SKB_LOOK_UP = 1 << 13,
 	SKB_LOOK_DOWN = 1 << 14,
@@ -103,7 +102,6 @@ union SYNCFLAGS
         unsigned int useCrystalBall : 1;
         unsigned int useJumpBoots : 1;
         unsigned int useMedKit : 1;
-        unsigned int newWeapon : 4;
     };
 };