From 6a92470846311c8543d832bdd623efc570d08849 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 20 Jan 2022 00:53:02 +0100
Subject: [PATCH] - made a few more names common.

These are needed by the ZScript compiler backend.
---
 src/common/engine/namedef.h | 25 ++++++++++++++++++++++---
 src/namedef_custom.h        | 17 -----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index 77eb95bf98..3c67191cda 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -10,6 +10,7 @@ xx(Object)
 xx(Actor)
 xx(Class)
 xx(Thinker)
+xx(Crosshairs)
 
 xx(Untranslated)
 
@@ -30,6 +31,9 @@ xx(ColorAdd)
 xx(Multiply)
 
 // Special names for compiler backend
+xx(Name)
+xx(Clamp)
+xx(Abs)
 xx(Random)
 xx(FRandom)
 xx(Random2)
@@ -43,7 +47,9 @@ xx(GetParentClass)
 xx(GetClassName)
 xx(IsAbstract)
 xx(GetDefaultByType)
+xx(Floor)
 xx(Exp)
+xx(Log)
 xx(Log10)
 xx(Ceil)
 xx(ACos)
@@ -64,6 +70,16 @@ xx(New)
 xx(Static)
 xx(Staticconst)
 
+// compatibility crap that GZDoom needs in the backend.
+xx(ACS_NamedExecuteWithResult)
+xx(__decorate_internal_int__)
+xx(__decorate_internal_bool__)
+xx(__decorate_internal_float__)
+xx(Weapon)
+xx(Item)
+xx(LevelLocals)
+xx(Level)
+
 xy(menu_cursor, "menu/cursor")
 xy(menu_choose, "menu/choose")
 xy(menu_backup, "menu/backup")
@@ -145,6 +161,11 @@ xx(r)
 xx(g)
 xx(b)
 
+xx(X)
+xx(Y)
+xx(Z)
+xx(XY)
+
 xx(Prototype)
 xx(Void)
 xx(Label)
@@ -186,6 +207,7 @@ xx(EndGameMenu)
 xx(HelpMenu)
 xx(SoundMenu)
 xx(ConfirmPlayerReset)
+xx(JoystickOptions)
 
 xx(OptionMenuItemSubmenu)
 xx(OptionMenuItemCommand)
@@ -211,6 +233,3 @@ xx(BuiltinNameToClass)
 xx(BuiltinClassCast)
 
 xx(ScreenJobRunner)
-
-
-
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index 85c93b6cb3..b970aac4d8 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -32,9 +32,7 @@ xx(Armor)
 
 // Per-actor sound channels (for deprecated PlaySoundEx function)
 xx(Auto)
-xx(Weapon)
 xx(Voice)
-xx(Item)
 xx(Body)
 xx(SoundSlot5)
 xx(SoundSlot6)
@@ -330,8 +328,6 @@ xx(InternalDynamicLight)
 xx(_a_chase_default)
 xx(MapMarker)
 xx(Spawn2)
-xx(LevelLocals)
-xx(Level)
 xx(PlayerTeam)
 xx(PlayerColors)
 xx(PlayerSkin)
@@ -362,7 +358,6 @@ xx(GenericCrush)
 // Bounce state names
 xx(Bounce)
 xx(Wall)
-xx(Floor)
 xx(Ceiling)
 xx(Creature)
 
@@ -432,7 +427,6 @@ xx(MapColorMenu)
 xx(GameplayOptions)
 xx(CompatibilityOptions)
 xx(MouseOptions)
-xx(JoystickOptions)
 xx(SoundOptions)
 xx(AdvSoundOptions)
 xx(ModReplayerOptions)
@@ -487,9 +481,6 @@ xx(Key)
 xx(RipSound)
 xx(Archvile)
 
-xx(__decorate_internal_int__)
-xx(__decorate_internal_bool__)
-xx(__decorate_internal_float__)
 xx(ResolveState)
 
 
@@ -507,19 +498,14 @@ xx(Special)
 xx(TID)
 xx(TIDtoHate)
 xx(WaterLevel)
-xx(X)
-xx(Y)
-xx(Z)
 xx(XY)
 xx(MomX)
 xx(MomY)
 xx(MomZ)
 xx(Threshold)
 xx(DefThreshold)
-xx(Abs)
 xx(TeleportSpecial)
 xx(Teleport)
-xx(ACS_NamedExecuteWithResult)
 xx(CallACS)
 xx(IsPointerEqual)
 xx(Pick)
@@ -535,7 +521,6 @@ xx(MeleeRange)
 xx(Speed)
 xx(FastSpeed)
 xx(HowlSound)
-xx(Clamp)
 xx(VisibleStartAngle)
 xx(VisibleStartPitch)
 xx(VisibleEndAngle)
@@ -842,14 +827,12 @@ xx(Text)
 xx(Displaycost)
 xx(Yesmessage)
 xx(Nomessage)
-xx(Log)
 xx(Giveitem)
 xx(Nextpage)
 xx(Closedialog)
 xx(Cost)
 xx(Page)
 xx(Count)
-xx(Name)
 xx(Panel)
 xx(Dialog)
 xx(Ifitem)