From a07e16099d0d1bd4007c893d01e7520edfe6163b Mon Sep 17 00:00:00 2001
From: Xaser Acheron <xaser@angryscience.net>
Date: Sun, 23 Jan 2022 20:05:32 -0600
Subject: [PATCH] move WeaponScaleX/Y namedefs to namedef_custom.h; clean
 unwanted stuff from merge

---
 src/common/engine/namedef.h | 23 -----------------------
 src/namedef_custom.h        |  2 ++
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index cf1b670be..77eb95bf9 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -199,29 +199,6 @@ xx(OptionMenuItemStaticTextSwitchable)
 
 xx(Color)
 
-// Weapon member fields that need direct access
-xx(Ammo1)
-xx(Ammo2)
-xx(AmmoType1)
-xx(AmmoType2)
-xx(AmmoGive1)
-xx(AmmoGive2)
-xx(AmmoUse1)
-xx(SisterWeapon)
-xx(BobStyle)
-xx(Kickback)
-xx(MinSelAmmo1)
-xx(bDehAmmo)
-xx(FOVScale)
-xx(LookScale)
-xx(YAdjust)
-xx(Crosshair)
-xx(WeaponFlags)
-xx(DropTime)
-xx(PickupSound)
-xx(WeaponScaleX)
-xx(WeaponScaleY)
-
 xx(Mididevices)
 xx(Aldevices)
 xx(Alresamplers)
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index 1c188007c..a1157aa38 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -279,6 +279,8 @@ xx(Crosshair)
 xx(WeaponFlags)
 xx(DropTime)
 xx(PickupSound)
+xx(WeaponScaleX)
+xx(WeaponScaleY)
 
 // PlayerPawn member fields
 xx(ColorRangeStart)