Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2

# Conflicts:
#	src/common/engine/namedef.h

src/common/utility/name.cpp

@@ -75,6 +75,9 @@ static const char *PredefinedNames[] =
 #define xx(n) #n,
 #define xy(n, s) s,
 #include "namedef.h"
+#if __has_include("namedef_custom.h")
+	#include "namedef_custom.h"
+#endif
 #undef xx
 #undef xy
 };

src/common/utility/name.h

@@ -42,6 +42,9 @@ enum ENamedName
 #define xx(n) NAME_##n,
 #define xy(n, s) NAME_##n,
 #include "namedef.h"
+#if __has_include("namedef_custom.h")
+	#include "namedef_custom.h"
+#endif
 #undef xx
 #undef xy
 };

src/namedef_custom.h

@@ -0,0 +1,861 @@
+// GZDoom specific names
+
+xx(Doom)
+xx(Heretic)
+xx(Hexen)
+xx(Strife)
+xx(Raven)
+
+// blood spawning
+xx(Blood)
+xx(BloodSplatter)
+xx(AxeBlood)
+xx(Spray)
+
+// Invulnerability types
+xx(Ghost)
+xx(Reflective)
+
+// Iron Feet types
+//xx(Normal)	// defined below
+xx(Full)
+
+// Invisibility types
+xx(Additive)
+xx(Fuzzy)
+xx(Stencil)
+xx(AddStencil)
+
+// Healingradius types
+xx(Mana)
+xx(Armor)
+
+// Per-actor sound channels (for deprecated PlaySoundEx function)
+xx(Auto)
+xx(Weapon)
+xx(Voice)
+xx(Item)
+xx(Body)
+xx(SoundSlot5)
+xx(SoundSlot6)
+xx(SoundSlot7)
+
+
+// Hexen sound sequence names
+xx(Platform)
+xx(PlatformMetal)
+xx(Silence)
+xx(Lava)
+xx(Water)
+xx(Ice)
+xx(Earth)
+xx(PlatformMetal2)
+xx(DoorNormal)
+xx(DoorHeavy)
+xx(DoorMetal)
+xx(DoorCreak)
+xx(DoorMetal2)
+xx(Wind)
+
+xx(PointPusher)
+xx(PointPuller)
+
+xx(UpperStackLookOnly)
+xx(LowerStackLookOnly)
+xx(StackPoint)
+xx(SkyCamCompat)
+
+xx(BasicArmorBonus)
+xx(BasicArmorPickup)
+xx(SaveAmount)
+xx(SavePercent)
+xx(MaxAbsorb)
+xx(MaxFullAbsorb)
+xx(MaxAmount)
+xx(ActualSaveAmount)
+xx(ArmorType)
+xx(HexenArmor)
+xx(Slots)
+xx(SlotsIncrement)
+xx(InterHubAmount)
+xx(Icon)
+xx(AltHUDIcon)
+xx(PickupFlash)
+
+xx(BulletPuff)
+xx(StrifePuff)
+xx(MaulerPuff)
+
+// Special bosses A_BossDeath knows about
+xx(Fatso)
+xx(Arachnotron)
+xx(BaronOfHell)
+xx(Cyberdemon)
+xx(SpiderMastermind)
+xx(Ironlich)
+xx(Minotaur)
+xx(Sorcerer2)
+
+// Bots check this
+xx(Megasphere)
+xx(MegasphereHealth)
+
+// Standard player classes
+xx(DoomPlayer)
+xx(HereticPlayer)
+xx(StrifePlayer)
+xx(FighterPlayer)
+xx(ClericPlayer)
+xx(MagePlayer)
+xx(ChexPlayer)
+xx(ChickenPlayer)
+xx(PigPlayer)
+
+// Flechette names for the different Hexen player classes
+xx(ArtiPoisonBag1)
+xx(ArtiPoisonBag2)
+xx(ArtiPoisonBag3)
+
+// Strife quests
+xx(QuestItem)
+xx(Sigil)
+xx(GiveSigilPiece)
+xx(SetWeapon)
+xx(SetSprite)
+
+// Armor
+xx(BasicArmor)
+
+// Doom ammo types
+xx(Clip)
+
+xx(PuzzleItem)
+xx(PuzzleItemNumber)
+xx(HealthPickup)
+xx(autousemode)
+xx(Ammo)
+xx(WeaponGiver)
+xx(DehackedPickup)
+xx(PowerTargeter)
+xx(PowerInvulnerable)
+xx(PowerStrength)
+xx(PowerInvisibility)
+xx(PowerIronFeet)
+xx(PowerLightAmp)
+xx(PowerWeaponLevel2)
+xx(PowerFlight)
+xx(PowerSpeed)
+xx(PowerTorch)
+xx(PowerHighJump)
+xx(PowerReflection)
+xx(PowerDrain)
+xx(Reflection)
+xx(CustomInventory)
+xx(Inventory)
+xx(StateProvider)
+xx(CallTryPickup)
+xx(QuestItem25)
+xx(QuestItem28)
+xx(PowerDoubleFiringSpeed)
+xx(PowerInfiniteAmmo)
+xx(PowerBuddha)
+
+xx(TeleportDest)
+xx(TeleportDest2)
+
+
+xx(Fist)
+//xx(Berserk)
+xx(Chainsaw)
+xx(Pistol)
+xx(Shotgun)
+xx(SSG)
+xx(Chaingun)
+xx(Rocket)
+xx(Plasma)
+xx(BFG)
+//xx(Railgun)
+xx(Dagger)
+
+// Damage types
+//xx(Fire)		already defined above
+//xx(Ice)
+//xx(Disintegrate)
+xx(Drowning)
+xx(Slime)
+//xx(Crush)
+xx(Telefrag)
+xx(Falling)
+xx(Suicide)
+xx(Exit)
+xx(Railgun)
+xx(Poison)
+xx(Electric)
+xx(BFGSplash)
+xx(DrainLife)	// A weapon like the Sigil that drains your life away.
+xx(Massacre)	// For death by a cheater!
+//(Melee)		already defined above, so don't define it again
+xx(InstantDeath)	// Strife "instant death"
+xx(PoisonCloud)	// makes monsters howl.
+xx(Hitscan)		// for normal guns and the like
+xx(Quake)
+
+// Special death name for getting killed excessively. Could be used as
+// a damage type if you wanted to force an extreme death.
+xx(Extreme)
+xx(MDK)
+xx(Cast) // 'damage type' for the cast call
+
+// Various actor names which are used internally
+xx(MapSpot)
+xx(PatrolPoint)
+xx(PatrolSpecial)
+xx(Communicator)
+xx(PowerScanner)
+
+xx(DeathmatchStatusScreen)
+xx(CoopStatusScreen)
+xx(DoomStatusScreen)
+xx(RavenStatusScreen)
+xx(DoomStatusScreenSized)
+xx(RavenStatusScreenSized)
+
+xx(Owner)
+xx(FlameThrower)
+
+// Dehacked
+xx(A_Punch)
+xx(A_FirePistol)
+xx(A_FireShotgun)
+xx(A_FireShotgun2)
+xx(A_FireCGun)
+xx(A_FireMissile)
+xx(A_Saw)
+xx(A_FirePlasma)
+xx(A_FireBFG)
+xx(A_FireOldBFG)
+xx(A_FireRailgun)
+xx(A_ConsumeAmmo)
+
+// Special translation names
+xx(RainPillar1)
+xx(RainPillar2)
+xx(RainPillar3)
+xx(RainPillar4)
+xx(RainPillar5)
+xx(RainPillar6)
+xx(RainPillar7)
+xx(RainPillar8)
+
+xx(Player1)
+xx(Player2)
+xx(Player3)
+xx(Player4)
+xx(Player5)
+xx(Player6)
+xx(Player7)
+xx(Player8)
+xx(PlayerChunk)
+xx(RestrictedToPlayerClass)
+xx(ForbiddenToPlayerClass)
+
+// 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)
+
+// PlayerPawn member fields
+xx(ColorRangeStart)
+xx(ColorRangeEnd)
+xx(InvFirst)
+xx(ForwardMove1)
+xx(ForwardMove2)
+xx(SideMove1)
+xx(SideMove2)
+xx(Face)
+xx(Slot)
+xx(SoundClass)
+xx(ViewBob)
+xx(DamageFade)
+xx(MaxHealth)
+xx(crouchsprite)
+xx(UseRange)
+xx(AttackZOffset)
+xx(SpawnMask)
+xx(ScoreIcon)
+xx(ViewHeight)
+xx(ViewAngle)
+xx(ViewPitch)
+xx(ViewRoll)
+xx(FallingScreamMinSpeed)
+xx(FallingScreamMaxSpeed)
+xx(GruntSpeed)
+xx(JumpZ)
+xx(MugShotMaxHealth)
+xx(BonusHealth)
+xx(PlayerFlags)
+xx(InvSel)
+xx(FullHeight)
+
+xx(BlueCard)
+xx(YellowCard)
+xx(RedCard)
+xx(BlueSkull)
+xx(YellowSkull)
+xx(RedSkull)
+xx(DynamicLight)
+xx(SpotInnerAngle)
+xx(SpotOuterAngle)
+xx(lightflags)
+xx(lighttype)
+xx(InternalDynamicLight)
+xx(_a_chase_default)
+xx(MapMarker)
+xx(Spawn2)
+xx(LevelLocals)
+xx(Level)
+xx(PlayerTeam)
+xx(PlayerColors)
+xx(PlayerSkin)
+xx(NewPlayerMenu)
+xx(AltHud)
+xx(GameScreen)
+xx(ListM)
+
+// Standard animator names.
+xx(Spawn)
+xx(See)
+xx(Pain)
+xx(Melee)
+xx(Missile)
+xx(Crash)
+xx(Death)
+xx(Raise)
+xx(Wound)
+xx(Heal)
+xx(Crush)
+xx(Yes)
+xx(No)
+xx(Greetings)
+xx(Idle)
+xx(GenericFreezeDeath)
+xx(GenericCrush)
+
+// Bounce state names
+xx(Bounce)
+xx(Wall)
+xx(Floor)
+xx(Ceiling)
+xx(Creature)
+
+// Compatible death names for the decorate parser.
+xx(XDeath)
+xx(Burn)
+//xx(Ice)			// already defined above
+xx(Disintegrate)
+xx(Smash)
+
+// Weapon animator names.
+xx(Select)
+xx(Deselect)
+xx(DeadLowered)
+xx(Ready)
+xx(Fire)
+xx(Hold)
+xx(AltFire)
+xx(AltHold)
+xx(Flash)
+xx(AltFlash)
+xx(Reload)
+xx(Zoom)
+xx(User1)
+xx(User2)
+xx(User3)
+xx(User4)
+
+// State names used by ASwitchableDecoration
+xx(Active)
+xx(Inactive)
+
+// State names used by ACustomInventory
+xx(Pickup)
+xx(Use)
+xx(Drop)
+
+
+// ScriptUtil entry points
+xx(ScriptUtil)
+xx(SetMarineWeapon)
+xx(SetMarineSprite)
+xx(GiveInventory)
+xx(TakeInventory)
+xx(ClearInventory)
+
+// summary
+xx(cwidth)
+xx(cheight)
+xx(wrapwidth)
+xx(scalefactorx)
+xx(scalefactory)
+xx(scalemode)
+
+xx(Team)
+xx(Skin)
+xx(Gender)
+xx(Autoaim)
+xx(Crosshairs)
+xx(Multiplayer)
+
+xx(CustomizeControls)
+xx(MessageOptions)
+xx(AutomapOptions)
+xx(ScoreboardOptions)
+xx(MapColorMenu)
+xx(GameplayOptions)
+xx(CompatibilityOptions)
+xx(MouseOptions)
+xx(JoystickOptions)
+xx(SoundOptions)
+xx(AdvSoundOptions)
+xx(ModReplayerOptions)
+xx(VideoOptions)
+xx(JoystickConfigMenu)
+xx(VideoModeMenu)
+
+// end sequences
+xx(Inter_Chess)
+xx(Inter_Strife)
+xx(Inter_Strife_Good)
+xx(Inter_Strife_Sad)
+xx(Inter_Strife_Bad)
+xx(Inter_Strife_Lose)
+xx(Inter_Strife_MAP03)
+xx(Inter_Strife_MAP10)
+
+xx(BuiltinCallLineSpecial)
+
+xx(MainmenuTextOnly)
+xx(Playerclassmenu)
+xx(HexenDefaultPlayerclassmenu)
+xx(Readthismenu)
+xx(Playermenu)
+
+// more stuff
+xx(ColorSet)
+xx(NeverSwitchOnPickup)
+xx(MoveBob)
+xx(StillBob)
+xx(ClassicFlight)
+xx(WBobSpeed)
+xx(WBobFire)
+xx(PlayerClass)
+xx(MonsterClass)
+xx(MorphedMonster)
+xx(Wi_NoAutostartMap)
+
+xx(Duration)
+xx(MorphStyle)
+xx(MorphFlash)
+xx(UnMorphFlash)
+xx(Powerup)
+xx(EffectTics)
+xx(PowerupGiver)
+xx(BlendColor)
+xx(Strength)
+xx(Mode)
+xx(PowerupType)
+xx(PlayerPawn)
+xx(Key)
+xx(RipSound)
+xx(Archvile)
+
+xx(__decorate_internal_int__)
+xx(__decorate_internal_bool__)
+xx(__decorate_internal_float__)
+xx(ResolveState)
+
+
+
+// UDMF keywords (todo: take these out of the global name table
+xx(Alpha)
+xx(Angle)
+xx(Args)
+xx(CeilingZ)
+xx(FloorZ)
+xx(Health)
+xx(Pitch)
+xx(SpecialName)
+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)
+xx(Mass)
+xx(VelX)
+xx(VelY)
+xx(VelZ)
+xx(Accuracy)
+xx(Stamina)
+xx(Radius)
+xx(ReactionTime)
+xx(MeleeRange)
+xx(Speed)
+xx(FastSpeed)
+xx(HowlSound)
+xx(Clamp)
+xx(VisibleStartAngle)
+xx(VisibleStartPitch)
+xx(VisibleEndAngle)
+xx(VisibleEndPitch)
+xx(Format)
+xx(PickupMsg)
+xx(Respawnable)
+xx(ExplosionDamage)
+xx(ExplosionRadius)
+xx(DontHurtShooter)
+xx(Noattack)
+
+//xx(X)
+//xx(Y)
+xx(ZFloor)
+xx(ZCeiling)
+xx(Height)
+//xx(Tid)
+//xx(Angle)
+xx(Type)
+//xx(Special)
+xx(Arg0)
+xx(Arg1)
+xx(Arg2)
+xx(Arg3)
+xx(Arg4)
+xx(Arg0Str)
+xx(Arg1Str)
+xx(Id)
+xx(MoreIds)
+xx(V1)
+xx(V2)
+
+xx(Sidefront)
+xx(Sideback)
+xx(Offsetx)
+xx(Offsety)
+xx(Texturetop)
+xx(Texturebottom)
+xx(Texturemiddle)
+xx(Sector)
+xx(Heightfloor)
+xx(Heightceiling)
+xx(Lightlevel)
+xx(Texturefloor)
+xx(Textureceiling)
+xx(Nodecals)
+
+xx(Skill1)
+xx(Skill2)
+xx(Skill3)
+xx(Skill4)
+xx(Skill5)
+xx(Skill6)
+xx(Skill7)
+xx(Skill8)
+xx(Skill9)
+xx(Skill10)
+xx(Skill11)
+xx(Skill12)
+xx(Skill13)
+xx(Skill14)
+xx(Skill15)
+xx(Skill16)
+xx(Medium)
+xx(Hard)
+xx(Ambush)
+xx(Dormant)
+xx(Class0)
+xx(Class1)
+xx(Class2)
+xx(Class3)
+xx(Class4)
+xx(Class5)
+xx(Class6)
+xx(Class7)
+xx(Class8)
+xx(Class9)
+xx(Class10)
+xx(Class11)
+xx(Class12)
+xx(Class13)
+xx(Class14)
+xx(Class15)
+xx(Class16)
+xx(Single)
+xx(Coop)
+xx(Dm)
+xx(Translucent)
+xx(Invisible)
+xx(Friend)
+xx(Strifeally)
+xx(Standing)
+xx(Countsecret)
+xx(NoCount)
+xx(Score)
+xx(Roll)
+xx(Scale)
+xx(ScaleX)
+xx(ScaleY)
+xx(FriendlySeeBlocks)
+xx(Floatbobphase)
+xx(Floatbobstrength)
+xx(Target)
+xx(Master)
+xx(Tracer)
+
+xx(Blocking)
+xx(Blockmonsters)
+xx(Twosided)
+xx(Dontpegtop)
+xx(Dontpegbottom)
+xx(Secret)
+xx(Blocksound)
+xx(Dontdraw)
+xx(Mapped)
+xx(Monsteractivate)
+xx(Blockplayers)
+xx(Blockeverything)
+xx(Zoneboundary)
+xx(Jumpover)
+xx(Blockfloaters)
+xx(Blocklandmonsters)
+xx(Clipmidtex)
+xx(Wrapmidtex)
+xx(Midtex3d)
+xx(Checkswitchrange)
+xx(Firstsideonly)
+xx(Transparent)	
+xx(Passuse)
+xx(Repeatspecial)
+xx(Conversation)
+xx(Locknumber)
+xx(Midtex3dimpassible)
+xx(Revealed)
+xx(AutomapStyle)
+xx(DrawFullHeight)
+
+xx(Playercross)
+xx(Playeruse)
+xx(Playeruseback)
+xx(Monstercross)
+xx(Impact)
+xx(Playerpush)
+xx(Missilecross)
+xx(Anycross)
+xx(Monsteruse)
+xx(Monsterpush)
+
+xx(ZDoom)
+xx(ZDoomTranslated)
+xx(Vavoom)
+xx(GZDoom)
+xx(Eternity)
+
+xx(Xpanningfloor)
+xx(Ypanningfloor)
+xx(Xpanningceiling)
+xx(Ypanningceiling)
+xx(Xscalefloor)
+xx(Yscalefloor)
+xx(Xscaleceiling)
+xx(Yscaleceiling)
+xx(Rotationfloor)
+xx(Rotationceiling)
+xx(Lightfloor)
+xx(Lightceiling)
+xx(Lightfloorabsolute)
+xx(Lightceilingabsolute)
+xx(Gravity)
+xx(Lightcolor)
+xx(Fadecolor)
+xx(Color_Floor)
+xx(Color_Ceiling)
+xx(Color_Walltop)
+xx(Color_Wallbottom)
+xx(Color_Sprites)
+xx(ColorAdd_Floor)
+xx(ColorAdd_Ceiling)
+xx(ColorAdd_Sprites)
+xx(ColorAdd_Walls)
+xx(NoSkyWalls)
+xx(Desaturation)
+xx(SoundSequence)
+xx(Silent)
+xx(Nofallingdamage)
+xx(Dropactors)
+xx(NoRespawn)
+xx(Alphafloor)
+xx(Alphaceiling)
+xx(Renderstylefloor)
+xx(Renderstyleceiling)
+xx(Waterzone)
+xx(portal_ceil_blocksound)
+xx(portal_ceil_disabled)
+xx(portal_ceil_nopass)
+xx(portal_ceil_norender)
+xx(portal_ceil_overlaytype)
+xx(portal_ceil_useglobaltex)
+xx(portal_floor_blocksound)
+xx(portal_floor_disabled)
+xx(portal_floor_nopass)
+xx(portal_floor_norender)
+xx(portal_floor_overlaytype)
+xx(portal_floor_useglobaltex)
+xx(scroll_ceil_x)
+xx(scroll_ceil_y)
+xx(scroll_ceil_type)
+xx(scroll_floor_x)
+xx(scroll_floor_y)
+xx(scroll_floor_type)
+
+xx(offsetx_top)
+xx(offsety_top)
+xx(offsetx_mid)
+xx(offsety_mid)
+xx(offsetx_bottom)
+xx(offsety_bottom)
+xx(scalex_top)
+xx(scaley_top)
+xx(scalex_mid)
+xx(scaley_mid)
+xx(scalex_bottom)
+xx(scaley_bottom)
+xx(light)
+xx(lightabsolute)
+xx(lightfog)
+xx(nofakecontrast)
+xx(smoothlighting)
+xx(blockprojectiles)
+xx(blockuse)
+xx(hidden)
+xx(blocksight)
+xx(blockhitscan)
+
+xx(nogradient_top)
+xx(flipgradient_top)
+xx(clampgradient_top)
+xx(useowncolors_top)
+xx(uppercolor_top)
+xx(lowercolor_top)
+xx(nogradient_mid)
+xx(flipgradient_mid)
+xx(clampgradient_mid)
+xx(useowncolors_mid)
+xx(uppercolor_mid)
+xx(lowercolor_mid)
+xx(nogradient_bottom)
+xx(flipgradient_bottom)
+xx(clampgradient_bottom)
+xx(useowncolors_bottom)
+xx(uppercolor_bottom)
+xx(lowercolor_bottom)
+xx(useowncoloradd_top)
+xx(coloradd_top)
+xx(useowncoloradd_mid)
+xx(coloradd_mid)
+xx(useowncoloradd_bottom)
+xx(coloradd_bottom)
+xx(colorization_top)
+xx(colorization_mid)
+xx(colorization_bottom)
+xx(colorization_floor)
+xx(colorization_ceiling)
+
+xx(ceilingplane_a)
+xx(ceilingplane_b)
+xx(ceilingplane_c)
+xx(ceilingplane_d)
+xx(floorplane_a)
+xx(floorplane_b)
+xx(floorplane_c)
+xx(floorplane_d)
+xx(damageamount)
+xx(damagetype)
+xx(damageinterval)
+xx(leakiness)
+xx(damageterraineffect)
+xx(damagehazard)
+xx(floorterrain)
+xx(ceilingterrain)
+xx(floor_reflect)
+xx(ceiling_reflect)
+xx(floorglowcolor)
+xx(floorglowheight)
+xx(ceilingglowcolor)
+xx(ceilingglowheight)
+xx(fogdensity)
+
+xx(HealthFloor)
+xx(HealthCeiling)
+xx(Health3D)
+xx(DamageSpecial)
+xx(DeathSpecial)
+xx(HealthFloorGroup)
+xx(HealthCeilingGroup)
+xx(Health3DGroup)
+xx(HealthGroup)
+xx(Renderstyle)
+
+// USDF keywords
+xx(Amount)
+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)
+xx(Choice)
+xx(Link)
+xx(Goodbye)
+xx(Require)
+xx(Exclude)
+xx(Userstring)
+xx(Sky)
+xx(Pagename)