diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index a745e5257..2e67ab2a7 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -107,7 +107,7 @@ void addammo(short weapon, struct player_struct* p, short amount)
 
 void addweapon(struct player_struct* p, short weapon)
 {
-	if (p->gotweapon[weapon] == 0)
+	if (!p->gotweapon[weapon])
 	{
 		p->gotweapon.Set(weapon);
 		if (weapon == SHRINKER_WEAPON)
diff --git a/source/games/duke/src/actors_e.cpp b/source/games/duke/src/actors_e.cpp
index 273b1b5bf..01cbd505d 100644
--- a/source/games/duke/src/actors_e.cpp
+++ b/source/games/duke/src/actors_e.cpp
@@ -5882,7 +5882,7 @@ DETONATEB:
                             P_AddAmmo(pPlayer, RPG_WEAPON, 1);
                         A_PlaySound(DUKE_GET, pPlayer->i);
 
-                        if ((pPlayer->gotweapon[HANDBOMB_WEAPON]) == 0 || pSprite->owner == pPlayer->i)
+                        if (!pPlayer->gotweapon[HANDBOMB_WEAPON] || pSprite->owner == pPlayer->i)
                             P_AddWeapon(pPlayer, HANDBOMB_WEAPON);
 
                         if (sprite[pSprite->owner].picnum != TILE_APLAYER)
diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp
index 00528e3d2..08af7a6ff 100644
--- a/source/games/duke/src/gameexec.cpp
+++ b/source/games/duke/src/gameexec.cpp
@@ -879,7 +879,7 @@ static void VM_AddWeapon(DukePlayer_t * const pPlayer, int const weaponNum, int
         return;
     }
 
-    if ((pPlayer->gotweapon[weaponNum]) == 0)
+    if (!pPlayer->gotweapon[weaponNum])
     {
         P_AddWeapon(pPlayer, weaponNum);
     }
diff --git a/source/games/duke/src/namesdyn.cpp b/source/games/duke/src/namesdyn.cpp
index 6b2d5f396..eeb44b438 100644
--- a/source/games/duke/src/namesdyn.cpp
+++ b/source/games/duke/src/namesdyn.cpp
@@ -33,7 +33,6 @@ BEGIN_DUKE_NS
 #define DVPTR(x) &x
 
 int16_t DynamicTileMap[MAXTILES];
-int16_t DynamicWeaponMap[MAX_WEAPONS];
 
 struct dynitem
 {
diff --git a/source/games/duke/src/namesdyn.h b/source/games/duke/src/namesdyn.h
index 04a1410b1..83837d20a 100644
--- a/source/games/duke/src/namesdyn.h
+++ b/source/games/duke/src/namesdyn.h
@@ -3592,9 +3592,7 @@ enum dukeweapon_t_alt
     CHICKEN_WEAPON,
 };
 
-extern int16_t DynamicWeaponMap[MAX_WEAPONS];
-
-#define DYNAMICWEAPONMAP(Weaponnum) (DynamicWeaponMap[Weaponnum])
+#define DYNAMICWEAPONMAP(Weaponnum) Weaponnum
 
 END_DUKE_NS
 
diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp
index 20ae38fd7..449e04b15 100644
--- a/source/games/duke/src/player.cpp
+++ b/source/games/duke/src/player.cpp
@@ -4703,7 +4703,7 @@ void P_AddWeapon(DukePlayer_t *pPlayer, int weaponNum)
         return;
     }
 
-    if ((pPlayer->gotweapon[weaponNum]) == 0)
+    if (!pPlayer->gotweapon[weaponNum])
     {
         pPlayer->gotweapon.Set(weaponNum);
 
diff --git a/source/games/duke/src/sbar.cpp b/source/games/duke/src/sbar.cpp
index 3645570ee..94ea46280 100644
--- a/source/games/duke/src/sbar.cpp
+++ b/source/games/duke/src/sbar.cpp
@@ -690,7 +690,7 @@ public:
         auto ShadeForWeapon = [=](int weapon, int optweapon = -1)
         {
             // Headache-inducing math at play here.
-            return (((!p->ammo_amount[weapon]) | ((p->gotweapon[weapon]) == 0)) * 9) + 12 - 18 * ((cw == weapon) || (optweapon != -1 && cw == optweapon));
+            return (((!p->ammo_amount[weapon]) | (!p->gotweapon[weapon])) * 9) + 12 - 18 * ((cw == weapon) || (optweapon != -1 && cw == optweapon));
         };
 
         DrawWeaponNum(2, x, y, p->ammo_amount[PISTOL_WEAPON], p->max_ammo_amount[PISTOL_WEAPON], 12 - 20 * (cw == PISTOL_WEAPON), 3);