move WeaponScaleX/Y namedefs to namedef_custom.h; clean unwanted stuff from merge

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)

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)