diff --git a/Game.Server/AI_BaseNPC.cs b/Game.Server/AI_BaseNPC.cs index 13a09a9b..f5c5c6ba 100644 --- a/Game.Server/AI_BaseNPC.cs +++ b/Game.Server/AI_BaseNPC.cs @@ -75,22 +75,6 @@ public struct AI_SchedLoadStatus public static class AI_BaseNPCGlobals { - // TODO: Enum these - // need a good name for its enum type - public const int SF_NPC_WAIT_TILL_SEEN = 1 << 0; - public const int SF_NPC_GAG = 1 << 1; - public const int SF_NPC_FALL_TO_GROUND = 1 << 2; - public const int SF_NPC_DROP_HEALTHKIT = 1 << 3; - public const int SF_NPC_START_EFFICIENT = 1 << 4; - public const int SF_NPC_WAIT_FOR_SCRIPT = 1 << 7; - public const int SF_NPC_LONG_RANGE = 1 << 8; - public const int SF_NPC_FADE_CORPSE = 1 << 9; - public const int SF_NPC_ALWAYSTHINK = 1 << 10; - public const int SF_NPC_TEMPLATE = 1 << 11; - public const int SF_NPC_ALTCOLLISION = 1 << 12; - public const int SF_NPC_NO_WEAPON_DROP = 1 << 13; - public const int SF_NPC_NO_PLAYER_PUSHAWAY = 1 << 14; - public const string PLAYER_SQUADNAME = "player_squad"; public static readonly ConVar ai_show_think_tolerance = new("ai_show_think_tolerance", "0"); @@ -334,6 +318,24 @@ public bool EnumEntity(IHandleEntity? handleEntity) { [NetworkName("CAI_BaseNPC")] public class AI_BaseNPC : BaseCombatCharacter, IAI_MovementSink { + [Flags] + public enum SF + { + WaitTillSeen = 1 << 0, + Gag = 1 << 1, + FallToGround = 1 << 2, + DropHealthkit = 1 << 3, + StartEfficient = 1 << 4, + WaitForScript = 1 << 7, + LongRange = 1 << 8, + FadeCorpse = 1 << 9, + AlwaysThink = 1 << 10, + Template = 1 << 11, + AltCollision = 1 << 12, + NoWeaponDrop = 1 << 13, + NoPlayerPushaway = 1 << 14, + } + public static ReadOnlySpan GetActivityName(Activity actID) { if (actID == Activity.ACT_INVALID) return "ACT_INVALID"; @@ -2638,7 +2640,7 @@ public static void InitSchedulingTables() { public NPCState GetIdealState() => IdealNPCState; - public override bool IsTemplate() => HasSpawnFlags(SF_NPC_TEMPLATE); + public override bool IsTemplate() => HasSpawnFlags(SF.Template); public static bool FindSpotForNPCInRadius(out Vector3 result, in Vector3 startPos, AI_BaseNPC npc, float radius, bool outOfPlayerViewcone = false) { BasePlayer? player = npc.AI_GetClosestPlayer(); @@ -2699,7 +2701,7 @@ public bool CineCleanup() { throw new NotImplementedException(); if (oldCine != null && !string.IsNullOrEmpty(oldCine.Play) && oldCine.PlayedSequence()) { - if (!oldCine.HasSpawnFlags(AI_ScriptedSequence.SF_SCRIPT_DONT_TELEPORT_AT_END)) { + if (!oldCine.HasSpawnFlags(AI_ScriptedSequence.SF.DontTeleportAtEnd)) { GetBonePosition(0, out Vector3 newOrigin, out _); Vector3 oldOrigin = GetLocalOrigin(); @@ -2757,7 +2759,7 @@ public bool CineCleanup() { SetCondition((int)SCOND_t.COND_LIGHT_DAMAGE); } - RemoveSpawnFlags(SF_NPC_WAIT_FOR_SCRIPT); + RemoveSpawnFlags(SF.WaitForScript); if (destroyCine) Util.Remove(oldCine); @@ -3584,7 +3586,7 @@ public void UnlockBestSound() { public AI_MoveEfficiency GetMoveEfficiency() => MoveEfficiency; public void SetMoveEfficiency(AI_MoveEfficiency efficiency) => MoveEfficiency = efficiency; - public bool IsFlaggedEfficient() => HasSpawnFlags(SF_NPC_START_EFFICIENT); + public bool IsFlaggedEfficient() => HasSpawnFlags(SF.StartEfficient); public void RemoveSleepFlags(AI_SleepFlags flags) => SleepFlags &= ~flags; public bool HasSleepFlags(AI_SleepFlags flags) => (SleepFlags & flags) == flags; @@ -5956,7 +5958,7 @@ public virtual bool ShouldPlayerAvoid() { if (IsInLockedScene() == true) return true; - if (HasSpawnFlags(SF_NPC_ALTCOLLISION)) + if (HasSpawnFlags(SF.AltCollision)) return true; return false; @@ -7168,7 +7170,7 @@ public void CheckOnGround() { public virtual bool ShouldPlayIdleSound() { if ((NPCState == NPCState.Idle || NPCState == NPCState.Alert) && - RandomInt(0, 99) == 0 && !HasSpawnFlags(SF_NPC_GAG)) { + RandomInt(0, 99) == 0 && !HasSpawnFlags(SF.Gag)) { return true; } @@ -7187,7 +7189,7 @@ public bool FOkToMakeSound(SentencePriority soundPriority = SentencePriority.Nor } } - if (HasSpawnFlags(SF_NPC_GAG) && (NPCState != NPCState.Combat)) + if (HasSpawnFlags(SF.Gag) && (NPCState != NPCState.Combat)) return false; return true; @@ -7205,7 +7207,7 @@ public virtual void DeathSound(in TakeDamageInfo info) { } public virtual void LostEnemySound() { } public virtual void FoundEnemySound() { } - public virtual bool ShouldAlwaysThink() => HasSpawnFlags(SF_NPC_ALWAYSTHINK); + public virtual bool ShouldAlwaysThink() => HasSpawnFlags(SF.AlwaysThink); static readonly int[] SenseConditionsToClear = [ (int)SCOND_t.COND_SEE_HATE, @@ -7522,7 +7524,7 @@ public virtual void NPCInit() { DistTooFar = 1024.0f; SetDistLook(2048.0f); - if (HasSpawnFlags(SF_NPC_LONG_RANGE)) { + if (HasSpawnFlags(SF.LongRange)) { DistTooFar = 1e9f; SetDistLook(6000.0f); } @@ -7553,7 +7555,7 @@ public virtual void NPCInit() { ForceGatherConditions(); - if (HasSpawnFlags(SF_NPC_WAIT_FOR_SCRIPT)) { + if (HasSpawnFlags(SF.WaitForScript)) { string? startSequence = AI_ScriptedSequence.GetSpawnPreIdleSequenceForScript(this); if (startSequence != null) SetSequence(LookupSequence(startSequence)); @@ -7561,7 +7563,7 @@ public virtual void NPCInit() { CreateVPhysics(); - if (HasSpawnFlags(SF_NPC_START_EFFICIENT)) + if (HasSpawnFlags(SF.StartEfficient)) SetEfficiency(AI_Efficiency.Efficient); FadeCorpse = ShouldFadeOnDeath(); @@ -7606,7 +7608,7 @@ public virtual void PostNPCInit() { } public virtual void StartNPC() { if ((GetMoveType() != Source.MoveType.Fly) && (GetMoveType() != Source.MoveType.FlyGravity) && (CapabilitiesGet() & Server.Capability.MoveFly) == 0 && - !HasSpawnFlags(SF_NPC_FALL_TO_GROUND) && !IsWaitingToRappel() && GetMoveParent() == null) { + !HasSpawnFlags(SF.FallToGround) && !IsWaitingToRappel() && GetMoveParent() == null) { Vector3 origin = GetLocalOrigin(); if (!GetMoveProbe()!.FloorPoint(origin + new Vector3(0, 0, 0.1f), Mask.NPCSolid, 0, -2048, out origin)) { @@ -7649,7 +7651,7 @@ public virtual void StartNPC() { ScriptArrivalActivity = AIN_DEF_ACTIVITY; ScriptArrivalSequence = null; - if (HasSpawnFlags(SF_NPC_WAIT_FOR_SCRIPT)) { + if (HasSpawnFlags(SF.WaitForScript)) { SetState(NPCState.Idle); Activity = IdealActivity; IdealSequence = GetSequence(); @@ -8172,7 +8174,7 @@ public bool ConditionInterruptsCurSchedule(int condition) { } public void TestPlayerPushing(BaseEntity? entity) { - if (HasSpawnFlags(SF_NPC_NO_PLAYER_PUSHAWAY)) + if (HasSpawnFlags(SF.NoPlayerPushaway)) return; BasePlayer? player = ToBasePlayer(entity); @@ -8846,7 +8848,7 @@ public void UpdateSleepState(bool inPVS) { } } - if ((GetSoundInterests() & (int)SoundInstanceType.Danger) != 0 && !HasSpawnFlags(SF_NPC_WAIT_TILL_SEEN)) { + if ((GetSoundInterests() & (int)SoundInstanceType.Danger) != 0 && !HasSpawnFlags(SF.WaitTillSeen)) { int sound = SoundEnt.ActiveList(); while (sound != SOUNDLIST_EMPTY) { diff --git a/Game.Server/AI_GoalPolice.cs b/Game.Server/AI_GoalPolice.cs index 68f4ee3e..89a7c758 100644 --- a/Game.Server/AI_GoalPolice.cs +++ b/Game.Server/AI_GoalPolice.cs @@ -13,8 +13,12 @@ namespace Game.Server; [LinkEntityToClass("ai_goal_police")] public class AI_PoliceGoal : BaseEntity { - public const int SF_POLICE_GOAL_KNOCKOUT_BEHIND = 1 << 1; - public const int SF_POLICE_GOAL_DO_NOT_LEAVE_POST = 1 << 2; + [Flags] + public enum SF + { + KnockoutBehind = 1 << 1, + DoNotLeavePost = 1 << 2, + } public static readonly new DataMap DataDesc = new(typeof(AI_PoliceGoal), BaseEntity.DataDesc, [ DEFINE.KEYFIELD(nameof(Radius), FieldType.Float, "PoliceRadius"), @@ -59,7 +63,7 @@ public bool ShouldKnockOutTarget(in Vector3 targetPos, bool targetVisible) { if (OverrideKnockOut) return true; - if (HasSpawnFlags(SF_POLICE_GOAL_KNOCKOUT_BEHIND) == false) + if (HasSpawnFlags(SF.KnockoutBehind) == false) return false; if (!targetVisible) @@ -78,7 +82,7 @@ public bool ShouldKnockOutTarget(in Vector3 targetPos, bool targetVisible) { public void KnockOutTarget(BaseEntity? target) => OnKnockOut.FireOutput(target, this); - public bool ShouldRemainAtPost() => HasSpawnFlags(SF_POLICE_GOAL_DO_NOT_LEAVE_POST); + public bool ShouldRemainAtPost() => HasSpawnFlags(SF.DoNotLeavePost); public void FireWarningLevelOutput(int level) { switch (level) { diff --git a/Game.Server/AI_Hint.cs b/Game.Server/AI_Hint.cs index 326c1929..ead6c767 100644 --- a/Game.Server/AI_Hint.cs +++ b/Game.Server/AI_Hint.cs @@ -233,7 +233,11 @@ static bool InZone(List zone, in Vector3 testPosition) { [LinkEntityToClass("ai_hint")] public class AI_Hint : ServerOnlyEntity { - public const int SF_ALLOW_JUMP_UP = 65536; + [Flags] + public enum SF + { + AllowJumpUp = 65536, + } public static readonly new DataMap DataDesc = new(typeof(AI_Hint), BaseEntity.DataDesc, [ DEFINE.EMBEDDED(nameof(NodeData)), diff --git a/Game.Server/AI_Pathfinder.cs b/Game.Server/AI_Pathfinder.cs index b61f879f..6b23075b 100644 --- a/Game.Server/AI_Pathfinder.cs +++ b/Game.Server/AI_Pathfinder.cs @@ -424,7 +424,7 @@ public bool IsLinkUsable(ref AI_Link link, int startID) { if (startHint != null && endHint != null) { if (startHint.HintType() == Hint.JumpOverride && endHint.HintType() == Hint.JumpOverride && - (((startHint.SpawnFlags | endHint.SpawnFlags) & AI_Hint.SF_ALLOW_JUMP_UP) != 0 || startHint.GetAbsOrigin().Z > endHint.GetAbsOrigin().Z)) { + (startHint.HasSpawnFlags(AI_Hint.SF.AllowJumpUp) || endHint.HasSpawnFlags(AI_Hint.SF.AllowJumpUp) ||startHint.GetAbsOrigin().Z > endHint.GetAbsOrigin().Z)) { if (!startNode.IsLocked()) { if (startHint.GetTargetNode() == -1 || startHint.GetTargetNode() == endID) moveType = Capability.MoveJump; diff --git a/Game.Server/AI_ScriptConditions.cs b/Game.Server/AI_ScriptConditions.cs index d7439425..436abf43 100644 --- a/Game.Server/AI_ScriptConditions.cs +++ b/Game.Server/AI_ScriptConditions.cs @@ -67,7 +67,11 @@ public class AI_ScriptConditionsElement [LinkEntityToClass("ai_script_conditions")] public class AI_ScriptConditions : BaseEntity, IEntityListener { - const int SF_ACTOR_AS_ACTIVATOR = 1 << 0; + [Flags] + public enum SF + { + ActorAsActivator = 1 << 0, + } static readonly ConVar debugscriptconditions = new("ai_debugscriptconditions", "0"); @@ -419,7 +423,7 @@ void EvaluationThink() { BaseEntity activator = this; #if HL2_EPISODIC - if (actor != null && HasSpawnFlags(SF_ACTOR_AS_ACTIVATOR)) + if (actor != null && HasSpawnFlags(SF.ActorAsActivator)) activator = actor; #endif diff --git a/Game.Server/AI_Senses.cs b/Game.Server/AI_Senses.cs index 2c5b9996..ee957740 100644 --- a/Game.Server/AI_Senses.cs +++ b/Game.Server/AI_Senses.cs @@ -87,7 +87,7 @@ public void Listen() { int soundMask = GetOuter()!.GetSoundInterests(); - if (soundMask != (int)SoundInstanceType.None && !GetOuter()!.HasSpawnFlags(SF_NPC_WAIT_TILL_SEEN)) { + if (soundMask != (int)SoundInstanceType.None && !GetOuter()!.HasSpawnFlags(AI_BaseNPC.SF.WaitTillSeen)) { int iSound = SoundEnt.ActiveList(); while (iSound != SOUNDLIST_EMPTY) { @@ -115,7 +115,7 @@ public bool ShouldSeeEntity(BaseEntity sightEnt) { if (sightEnt.IsPlayer() && g_IgnorePlayers.GetBool()) return false; - if ((sightEnt.SpawnFlags & SF_NPC_WAIT_TILL_SEEN) != 0) + if (sightEnt.HasSpawnFlags(AI_BaseNPC.SF.WaitTillSeen)) return false; if (!sightEnt.CanBeSeenBy(GetOuter()!)) @@ -151,13 +151,13 @@ void NoteSeenEntity(BaseEntity sightEnt) { } bool WaitingUntilSeen(BaseEntity sightEnt) { - if ((GetOuter()!.SpawnFlags & SF_NPC_WAIT_TILL_SEEN) != 0) { + if (GetOuter()!.HasSpawnFlags(AI_BaseNPC.SF.WaitTillSeen)) { if (sightEnt.IsPlayer()) { BasePlayer? player = ToBasePlayer(sightEnt); if (player != null && player.FInViewCone(GetOuter()!) && FBoxVisible(sightEnt, GetOuter()!, out _)) { - GetOuter()!.SpawnFlags &= ~SF_NPC_WAIT_TILL_SEEN; + GetOuter()!.RemoveSpawnFlags(AI_BaseNPC.SF.WaitTillSeen); return false; } } diff --git a/Game.Server/AI_Sentence.cs b/Game.Server/AI_Sentence.cs index bc8ca606..f6732baf 100644 --- a/Game.Server/AI_Sentence.cs +++ b/Game.Server/AI_Sentence.cs @@ -71,15 +71,15 @@ bool MatchesCriteria(SentenceCriteria criteria) { return true; case SentenceCriteria.Normal: - return (GetOuter()!.GetState() == NPCState.Combat) || (GetOuter()!.HasSpawnFlags(SF_NPC_GAG) == false); + return (GetOuter()!.GetState() == NPCState.Combat) || (GetOuter()!.HasSpawnFlags(AI_BaseNPC.SF.Gag) == false); case SentenceCriteria.InSquad: - if ((GetOuter()!.GetState() != NPCState.Combat) && GetOuter()!.HasSpawnFlags(SF_NPC_GAG)) + if ((GetOuter()!.GetState() != NPCState.Combat) && GetOuter()!.HasSpawnFlags(AI_BaseNPC.SF.Gag)) return false; return GetOuter()!.GetSquad() != null && (GetOuter()!.GetSquad()!.NumMembers() > 1); case SentenceCriteria.SquadLeader: { - if ((GetOuter()!.GetState() != NPCState.Combat) && GetOuter()!.HasSpawnFlags(SF_NPC_GAG)) + if ((GetOuter()!.GetState() != NPCState.Combat) && GetOuter()!.HasSpawnFlags(AI_BaseNPC.SF.Gag)) return false; AI_Squad? squad = GetOuter()!.GetSquad(); diff --git a/Game.Server/BaseCombatCharacter.cs b/Game.Server/BaseCombatCharacter.cs index bcc28961..29bbeb05 100644 --- a/Game.Server/BaseCombatCharacter.cs +++ b/Game.Server/BaseCombatCharacter.cs @@ -492,7 +492,7 @@ public bool Weapon_IsOnGround(BaseCombatWeapon weapon) { float curDist = (weapon.GetLocalOrigin() - GetLocalOrigin()).Length(); - if (weapon.HasSpawnFlags(BaseCombatWeapon.SF_WEAPON_NO_PLAYER_PICKUP)) + if (weapon.HasSpawnFlags(BaseCombatWeapon.SF.NoPlayerPickup)) curDist *= 0.5f; if (bestWeapon != null) { @@ -584,7 +584,7 @@ public virtual void Weapon_Equip(BaseCombatWeapon weapon) { } if (IsPlayer() == false) { - if (HasSpawnFlags(AI_BaseNPCGlobals.SF_NPC_LONG_RANGE)) { + if (HasSpawnFlags(AI_BaseNPC.SF.LongRange)) { ActiveWeapon.Get()!.MaxRange1 = 999999999; ActiveWeapon.Get()!.MaxRange2 = 999999999; } diff --git a/Game.Server/BaseCombatWeapon.cs b/Game.Server/BaseCombatWeapon.cs index aaa817f2..2534e46f 100644 --- a/Game.Server/BaseCombatWeapon.cs +++ b/Game.Server/BaseCombatWeapon.cs @@ -71,7 +71,7 @@ public static int GetAvailableWeaponsInBox(Span list, in Vect public override EntityCapabilities ObjectCaps() { EntityCapabilities caps = base.ObjectCaps(); - if (!IsFollowingEntity() && !HasSpawnFlags(SF_WEAPON_NO_PLAYER_PICKUP)) + if (!IsFollowingEntity() && !HasSpawnFlags(BaseCombatWeapon.SF.NoPlayerPickup)) caps |= EntityCapabilities.ImpulseUse; return caps; @@ -234,7 +234,7 @@ public void Materialize() { DoMuzzleFlash(); } - if (HasSpawnFlags(BasePlayer.SF_NORESPAWN) == false) { + if (HasSpawnFlags(BasePlayer.SF.NoRespawn) == false) { VPhysicsInitNormal(SolidType.BBox, GetSolidFlags() | SolidFlags.Trigger, false); SetMoveType(Source.MoveType.VPhysics); } diff --git a/Game.Server/BaseEntity.cs b/Game.Server/BaseEntity.cs index ede31158..e1d10b43 100644 --- a/Game.Server/BaseEntity.cs +++ b/Game.Server/BaseEntity.cs @@ -991,7 +991,7 @@ private ref QAngle UseStepSimulationNetworkAngles(out bool ok) { if (Physics.g_bTestMoveTypeStepSimulation && GetMoveType() == Source.MoveType.Step && HasDataObjectType(DataObjectType.StepSimulation)) { ref StepSimulationData step = ref GetDataObject(DataObjectType.StepSimulation); ComputeStepSimulationNetwork(ref step); - + ok = step.AnglesActive; return ref step.NetworkAngles; } @@ -2719,6 +2719,8 @@ public static void PrecacheModelComponents(int modelIndex) { public bool HasSpawnFlags(int flags) => (SpawnFlags & flags) != 0; + public bool HasSpawnFlags(T flags) where T : unmanaged, Enum => HasSpawnFlags(Unsafe.As(ref flags)); + public int GetModelIndex() => ModelIndex; /// @@ -3117,7 +3119,13 @@ public virtual Vector3 GetSmoothedVelocity() { public virtual void PostClientActive() { } public void AddSpawnFlags(int flags) => SpawnFlags |= flags; + + public void AddSpawnFlags(T flags) where T : unmanaged, Enum => AddSpawnFlags(Unsafe.As(ref flags)); + public void RemoveSpawnFlags(int flags) => SpawnFlags &= ~flags; + + public void RemoveSpawnFlags(T flags) where T : unmanaged, Enum => RemoveSpawnFlags(Unsafe.As(ref flags)); + public void SetFriction(float friction) => Friction = friction; public TimeUnit_t GetNextThink(ReadOnlySpan context = default) { diff --git a/Game.Server/EnvFade.cs b/Game.Server/EnvFade.cs index 30140849..c6031bcb 100644 --- a/Game.Server/EnvFade.cs +++ b/Game.Server/EnvFade.cs @@ -32,16 +32,20 @@ public class EnvFade : LogicalEntity public void SetDuration(float duration) => Duration = duration; public void SetHoldTime(float hold) => HoldTime = hold; - /// - /// Fade in, not out - /// - const int SF_FADE_IN = 0x0001; - /// - /// Modulate, don't blend - /// - const int SF_FADE_MODULATE = 0x0002; - const int SF_FADE_ONLYONE = 0x0004; - const int SF_FADE_STAYOUT = 0x0008; + [Flags] + public enum SF + { + /// + /// Fade in, not out + /// + In = 0x0001, + /// + /// Modulate, don't blend + /// + Modulate = 0x0002, + OnlyOne = 0x0004, + StayOut = 0x0008, + } public override void Spawn() { } @@ -51,18 +55,18 @@ public override void Spawn() { } public void InputFade(InputData inputdata) { FadeFlags fadeFlags = 0; - if ((SpawnFlags & SF_FADE_IN) != 0) + if (HasSpawnFlags(SF.In)) fadeFlags |= FadeFlags.In; else fadeFlags |= FadeFlags.Out; - if ((SpawnFlags & SF_FADE_MODULATE) != 0) + if (HasSpawnFlags(SF.Modulate)) fadeFlags |= FadeFlags.Modulate; - if ((SpawnFlags & SF_FADE_STAYOUT) != 0) + if (HasSpawnFlags(SF.StayOut)) fadeFlags |= FadeFlags.StayOut; - if ((SpawnFlags & SF_FADE_ONLYONE) != 0) { + if (HasSpawnFlags(SF.OnlyOne)) { if (inputdata.Activator != null && inputdata.Activator.IsNetClient()) Util.ScreenFade(inputdata.Activator, ColorRender, GetDuration(), GetHoldTime(), fadeFlags); } diff --git a/Game.Server/EnvMessage.cs b/Game.Server/EnvMessage.cs index 1e6f61ae..50259076 100644 --- a/Game.Server/EnvMessage.cs +++ b/Game.Server/EnvMessage.cs @@ -15,8 +15,12 @@ namespace Game.Server; public class Message : PointEntity { - public const int SF_MESSAGE_ONCE = 0x0001; - public const int SF_MESSAGE_ALL = 0x0002; + [Flags] + public enum SF + { + Once = 0x0001, + All = 0x0002, + } public override void Spawn() { Precache(); @@ -74,7 +78,7 @@ public override void Use(BaseEntity? activator, BaseEntity? caller, UseType useT private void InputShowMessage(ref InputData inputData) { BaseEntity? player = null; - if ((SpawnFlags & SF_MESSAGE_ALL) != 0) + if (HasSpawnFlags(SF.All)) Util.ShowMessageAll(MessageText); else { if (inputData.Activator != null && inputData.Activator.IsPlayer()) @@ -99,7 +103,7 @@ private void InputShowMessage(ref InputData inputData) { EmitSound(filter, EntIndex(), ep); } - if ((SpawnFlags & Message.SF_MESSAGE_ONCE) != 0) + if (HasSpawnFlags(SF.Once)) Util.Remove(this); OnShowMessage.FireOutput(inputData.Activator, this); diff --git a/Game.Server/EnvMicrophone.cs b/Game.Server/EnvMicrophone.cs index 0f9f585d..0aace348 100644 --- a/Game.Server/EnvMicrophone.cs +++ b/Game.Server/EnvMicrophone.cs @@ -22,13 +22,17 @@ public enum MicrophoneResult [LinkEntityToClass("env_microphone")] public class EnvMicrophone : PointEntity { - public const int SF_MICROPHONE_SOUND_COMBAT = 0x01; - public const int SF_MICROPHONE_SOUND_WORLD = 0x02; - public const int SF_MICROPHONE_SOUND_PLAYER = 0x04; - public const int SF_MICROPHONE_SOUND_BULLET_IMPACT = 0x08; - public const int SF_MICROPHONE_SWALLOW_ROUTED_SOUNDS = 0x10; - public const int SF_MICROPHONE_SOUND_EXPLOSION = 0x20; - public const int SF_MICROPHONE_IGNORE_NONATTENUATED = 0x40; + [Flags] + public enum SF + { + SoundCombat = 0x01, + SoundWorld = 0x02, + SoundPlayer = 0x04, + SoundBulletImpact = 0x08, + SwallowRoutedSounds = 0x10, + SoundExplosion = 0x20, + IgnoreNonattenuated = 0x40, + } const float MICROPHONE_SETTLE_EPSILON = 0.005f; @@ -82,12 +86,12 @@ public override void UpdateOnRemove() { base.UpdateOnRemove(); } - static readonly (int SpawnFlag, SoundInstanceType Type)[] SpawnFlagSoundTypes = [ - (SF_MICROPHONE_SOUND_COMBAT, SoundInstanceType.Combat), - (SF_MICROPHONE_SOUND_WORLD, SoundInstanceType.World), - (SF_MICROPHONE_SOUND_PLAYER, SoundInstanceType.Player), - (SF_MICROPHONE_SOUND_BULLET_IMPACT, SoundInstanceType.BulletImpact), - (SF_MICROPHONE_SOUND_EXPLOSION, SoundInstanceType.ContextExplosion), + static readonly (SF SpawnFlag, SoundInstanceType Type)[] SpawnFlagSoundTypes = [ + (SF.SoundCombat, SoundInstanceType.Combat), + (SF.SoundWorld, SoundInstanceType.World), + (SF.SoundPlayer, SoundInstanceType.Player), + (SF.SoundBulletImpact, SoundInstanceType.BulletImpact), + (SF.SoundExplosion, SoundInstanceType.ContextExplosion), ]; public override void Spawn() { @@ -212,7 +216,7 @@ public bool CanHearSound(int entindex, SoundLevel soundlevel, ref float volume, return false; } - if (HasSpawnFlags(SF_MICROPHONE_IGNORE_NONATTENUATED) && soundlevel == Source.Common.Audio.SoundLevel.LvlNone) + if (HasSpawnFlags(SF.IgnoreNonattenuated) && soundlevel == Source.Common.Audio.SoundLevel.LvlNone) return false; BaseEntity? entity = null; @@ -337,7 +341,7 @@ MicrophoneResult SoundPlayed(int entindex, ReadOnlySpan soundname, SoundLe if (soundorigins != null) soundorigins.AddRange(ep.SoundOrigin!); - if (HasSpawnFlags(SF_MICROPHONE_SWALLOW_ROUTED_SOUNDS)) + if (HasSpawnFlags(SF.SwallowRoutedSounds)) return MicrophoneResult.Swallow; return MicrophoneResult.Ok; diff --git a/Game.Server/FuncRotating.cs b/Game.Server/FuncRotating.cs index 1a7100b0..b9fc1691 100644 --- a/Game.Server/FuncRotating.cs +++ b/Game.Server/FuncRotating.cs @@ -18,19 +18,23 @@ namespace Game.Server; [NetworkName("CFuncRotating")] public class FuncRotating : BaseEntity { - public const int SF_BRUSH_ROTATE_Y_AXIS = 0; - public const int SF_BRUSH_ROTATE_START_ON = 1; - public const int SF_BRUSH_ROTATE_BACKWARDS = 2; - public const int SF_BRUSH_ROTATE_Z_AXIS = 4; - public const int SF_BRUSH_ROTATE_X_AXIS = 8; - public const int SF_BRUSH_ROTATE_CLIENTSIDE = 16; - public const int SF_BRUSH_ROTATE_SMALLRADIUS = 128; - public const int SF_BRUSH_ROTATE_MEDIUMRADIUS = 256; - public const int SF_BRUSH_ROTATE_LARGERADIUS = 512; - - public const int SF_BRUSH_ACCDCC = 16; - public const int SF_BRUSH_HURT = 32; - public const int SF_ROTATING_NOT_SOLID = 64; + [Flags] + public enum SF + { + YAxis = 0, + StartOn = 1, + Backwards = 2, + ZAxis = 4, + XAxis = 8, + ClientSide = 16, + SmallRadius = 128, + MediumRadius = 256, + LargeRadius = 512, + + AccDcc = 16, + Hurt = 32, + NotSolid = 64, + } const int FANPITCHMIN = 30; const int FANPITCHMAX = 100; @@ -132,11 +136,11 @@ public override void Spawn() { if (Volume == 0.0) Volume = 1.0f; - if (HasSpawnFlags(SF_BRUSH_ROTATE_SMALLRADIUS)) + if (HasSpawnFlags(SF.SmallRadius)) Attenuation = ATTN_IDLE; - else if (HasSpawnFlags(SF_BRUSH_ROTATE_MEDIUMRADIUS)) + else if (HasSpawnFlags(SF.MediumRadius)) Attenuation = ATTN_STATIC; - else if (HasSpawnFlags(SF_BRUSH_ROTATE_LARGERADIUS)) + else if (HasSpawnFlags(SF.LargeRadius)) Attenuation = ATTN_NORM; else Attenuation = ATTN_NORM; @@ -144,19 +148,19 @@ public override void Spawn() { if (FanFriction == 0) FanFriction = 1; - if (HasSpawnFlags(SF_BRUSH_ROTATE_Z_AXIS)) + if (HasSpawnFlags(SF.ZAxis)) MoveAng = new(0, 0, 1); - else if (HasSpawnFlags(SF_BRUSH_ROTATE_X_AXIS)) + else if (HasSpawnFlags(SF.XAxis)) MoveAng = new(1, 0, 0); else MoveAng = new(0, 1, 0); - if (HasSpawnFlags(SF_BRUSH_ROTATE_BACKWARDS)) + if (HasSpawnFlags(SF.Backwards)) MoveAng = MoveAng * -1; SetSolid(SolidType.VPhysics); - if (HasSpawnFlags(SF_ROTATING_NOT_SOLID)) { + if (HasSpawnFlags(SF.NotSolid)) { AddSolidFlags(SolidFlags.NotSolid); SetMoveType(Source.MoveType.Push); } @@ -173,12 +177,12 @@ public override void Spawn() { if (MaxSpeed == 0) MaxSpeed = 100; - if (HasSpawnFlags(SF_BRUSH_ROTATE_START_ON)) { + if (HasSpawnFlags(SF.StartOn)) { SetThink(SUB_CallUseToggle); SetNextThink(gpGlobals.CurTime + .2); } - if (HasSpawnFlags(SF_BRUSH_HURT)) + if (HasSpawnFlags(SF.Hurt)) SetTouch(HurtTouch); Speed = 0; @@ -408,7 +412,7 @@ public void SetTargetSpeed(float speed) { TargetSpeed = speed; - if (!HasSpawnFlags(SF_BRUSH_ACCDCC)) { + if (!HasSpawnFlags(SF.AccDcc)) { UpdateSpeed(TargetSpeed); SetMoveDone(RotateMove); } diff --git a/Game.Server/FuncTrackTrain.cs b/Game.Server/FuncTrackTrain.cs index 31f6f475..8137382d 100644 --- a/Game.Server/FuncTrackTrain.cs +++ b/Game.Server/FuncTrackTrain.cs @@ -31,14 +31,18 @@ public enum TrainOrientationType [NetworkName("CFuncTrackTrain")] public class FuncTrackTrain : BaseEntity { - public const int SF_TRACKTRAIN_NOPITCH = 0x0001; - public const int SF_TRACKTRAIN_NOCONTROL = 0x0002; - public const int SF_TRACKTRAIN_FORWARDONLY = 0x0004; - public const int SF_TRACKTRAIN_PASSABLE = 0x0008; - public const int SF_TRACKTRAIN_FIXED_ORIENTATION = 0x0010; - public const int SF_TRACKTRAIN_HL1TRAIN = 0x0080; - public const int SF_TRACKTRAIN_USE_MAXSPEED_FOR_PITCH = 0x0100; - public const int SF_TRACKTRAIN_UNBLOCKABLE_BY_PLAYER = 0x0200; + [Flags] + public enum SF + { + NoPitch = 0x0001, + NoControl = 0x0002, + ForwardOnly = 0x0004, + Passable = 0x0008, + FixedOrientation = 0x0010, + HL1Train = 0x0080, + UseMaxSpeedForPitch = 0x0100, + UnblockableByPlayer = 0x0200, + } public const int TRAIN_ACTIVE = 0x80; public const int TRAIN_NEW = 0xc0; @@ -258,7 +262,7 @@ public override void Use(BaseEntity? activator, BaseEntity? caller, UseType useT delta = 1; else if (delta < -0.25f) delta = -0.25f; - if ((SpawnFlags & SF_TRACKTRAIN_FORWARDONLY) != 0) { + if (HasSpawnFlags(SF.ForwardOnly)) { if (delta < 0) delta = 0; } @@ -403,7 +407,7 @@ public override void Blocked(BaseEntity? other) { newVelocity *= BlockDamage; other.SetAbsVelocity(newVelocity); } - if (HasSpawnFlags(SF_TRACKTRAIN_UNBLOCKABLE_BY_PLAYER)) { + if (HasSpawnFlags(SF.UnblockableByPlayer)) { BaseEntity? physicsBlocker = FindPhysicsBlockerForHierarchy(this); if (physicsBlocker != null) { long ticksBlocked = gpGlobals.TickCount - LastBlockTick; @@ -464,7 +468,7 @@ public void SoundUpdate() { } float speedRatio; - if (HasSpawnFlags(SF_TRACKTRAIN_USE_MAXSPEED_FOR_PITCH)) + if (HasSpawnFlags(SF.UseMaxSpeedForPitch)) speedRatio = Math.Clamp(MathF.Abs(Speed) / MaxSpeed, 0.0f, 1.0f); else speedRatio = Math.Clamp(MathF.Abs(Speed) / TRAIN_MAXSPEED, 0.0f, 1.0f); @@ -532,10 +536,10 @@ public void SoundUpdate() { void ArriveAtNode(PathTrack node) { FirePassInputs(node, node.GetNext(), true); - if (node.HasSpawnFlags(PathTrack.SF_PATH_DISABLE_TRAIN)) - SpawnFlags |= SF_TRACKTRAIN_NOCONTROL; + if (node.HasSpawnFlags(PathTrack.SF.DisableTrain)) + AddSpawnFlags(SF.NoControl); - if ((SpawnFlags & SF_TRACKTRAIN_NOCONTROL) != 0) { + if (HasSpawnFlags(SF.NoControl)) { if (node.Speed != 0) { SetSpeed(node.Speed); DevMsg(2, $"TrackTrain {GetDebugName()} arrived at {node.GetDebugName()}, speed to {node.Speed,4:F2}\n"); @@ -603,7 +607,7 @@ void UpdateTrainVelocity(PathTrack? prev, PathTrack? next, in Vector3 nextPos, f TrainOrientationType GetTrainOrientationType() => OrientationType; void UpdateTrainOrientation(PathTrack? prev, PathTrack? next, in Vector3 nextPos, float interval) { - if (HasSpawnFlags(SF_TRACKTRAIN_FIXED_ORIENTATION)) + if (HasSpawnFlags(SF.FixedOrientation)) return; Assert(prev == null || prev.GetMoveParent() == GetMoveParent()); @@ -671,7 +675,7 @@ void UpdateOrientationBlend(TrainOrientationType orientationType, PathTrack prev else angNext = angPrev; - if ((SpawnFlags & SF_TRACKTRAIN_NOPITCH) != 0) + if (HasSpawnFlags(SF.NoPitch)) angNext[PITCH] = angPrev[PITCH]; float p = 0; @@ -697,7 +701,7 @@ void UpdateOrientationBlend(TrainOrientationType orientationType, PathTrack prev MathLib.QuaternionAngles(qtNew, out angNew); } - if ((SpawnFlags & SF_TRACKTRAIN_NOPITCH) != 0) + if (HasSpawnFlags(SF.NoPitch)) angNew[PITCH] = angPrev[PITCH]; DoUpdateOrientation(GetLocalAngles(), angNew, interval); @@ -705,7 +709,7 @@ void UpdateOrientationBlend(TrainOrientationType orientationType, PathTrack prev void DoUpdateOrientation(in QAngle curAngles, in QAngle angles, float interval) { float vy, vx; - if ((SpawnFlags & SF_TRACKTRAIN_NOPITCH) == 0) + if (!HasSpawnFlags(SF.NoPitch)) vx = MathLib.AngleDistance(angles.X, curAngles.X); else vx = 0; @@ -742,11 +746,11 @@ void TeleportToPathTrack(PathTrack teleport) { teleport.LookAhead(ref look, Length, 0); QAngle nextAngles; - if (HasSpawnFlags(SF_TRACKTRAIN_FIXED_ORIENTATION) || look == nextPos) + if (HasSpawnFlags(SF.FixedOrientation) || look == nextPos) nextAngles = GetLocalAngles(); else { nextAngles = teleport.GetOrientation(IsDirForward()); - if (HasSpawnFlags(SF_TRACKTRAIN_NOPITCH)) + if (HasSpawnFlags(SF.NoPitch)) nextAngles[PITCH] = angCur[PITCH]; } @@ -811,7 +815,7 @@ public void Next() { ArriveAtNode(next); PathTrack? teleport = next.GetNext(); - if (teleport != null && teleport.HasSpawnFlags(PathTrack.SF_PATH_TELEPORT)) + if (teleport != null && teleport.HasSpawnFlags(PathTrack.SF.Teleport)) TeleportToPathTrack(teleport); } @@ -902,7 +906,7 @@ public void SetControls(BaseEntity controls) { public override bool OnControls(BaseEntity test) { Vector3 offset = test.GetLocalOrigin() - GetLocalOrigin(); - if ((SpawnFlags & SF_TRACKTRAIN_NOCONTROL) != 0) + if (HasSpawnFlags(SF.NoControl)) return false; Matrix4x4 tmp = default; @@ -939,11 +943,11 @@ public void Find() { look.Z += Height; QAngle nextAngles; - if (HasSpawnFlags(SF_TRACKTRAIN_FIXED_ORIENTATION)) + if (HasSpawnFlags(SF.FixedOrientation)) nextAngles = GetLocalAngles(); else { MathLib.VectorAngles(look - nextPos, out nextAngles); - if (HasSpawnFlags(SF_TRACKTRAIN_NOPITCH)) + if (HasSpawnFlags(SF.NoPitch)) nextAngles.X = 0; } @@ -1040,11 +1044,11 @@ public override void Spawn() { SetModel(GetModelName()); SetMoveType(Source.MoveType.Push); - SetSolid(HasSpawnFlags(SF_TRACKTRAIN_HL1TRAIN) ? SolidType.BSP : SolidType.VPhysics); + SetSolid(HasSpawnFlags(SF.HL1Train) ? SolidType.BSP : SolidType.VPhysics); - if (HasSpawnFlags(SF_TRACKTRAIN_UNBLOCKABLE_BY_PLAYER)) + if (HasSpawnFlags(SF.UnblockableByPlayer)) AddFlag(EntityFlags.UnblockableByPlayer); - if ((SpawnFlags & SF_TRACKTRAIN_PASSABLE) != 0) + if (HasSpawnFlags(SF.Passable)) AddSolidFlags(SolidFlags.NotSolid); ControlMins = CollisionProp().OBBMins(); diff --git a/Game.Server/Items.cs b/Game.Server/Items.cs index ce41f38c..39ee86ec 100644 --- a/Game.Server/Items.cs +++ b/Game.Server/Items.cs @@ -28,11 +28,16 @@ public static class ItemConstants public const int SIZE_AMMO_357_LARGE = 20; public const int SIZE_AMMO_CROSSBOW = 6; public const int SIZE_AMMO_AR2_ALTFIRE = 1; - public const int SF_ITEM_START_CONSTRAINED = 0x00000001; } public class Item : BaseAnimating, IPlayerPickupVPhysics { + [Flags] + public enum SF + { + StartConstrained = 0x00000001, + } + readonly DefaultPlayerPickupVPhysics pickup = new(); public bool ForcePhysgunOpen(BasePlayer player) => ((IPlayerPickupVPhysics)pickup).ForcePhysgunOpen(player); diff --git a/Game.Server/LogicAuto.cs b/Game.Server/LogicAuto.cs index 6c6fd1b9..9ce9d699 100644 --- a/Game.Server/LogicAuto.cs +++ b/Game.Server/LogicAuto.cs @@ -10,7 +10,11 @@ namespace Game.Server; [LinkEntityToClass("logic_auto")] class LogicAuto : BaseEntity { - const int SF_AUTO_FIREONCE = 0x01; + [Flags] + public enum SF + { + FireOnce = 0x01, + } OutputEvent OnMapSpawn = new(); OutputEvent OnNewGame = new(); @@ -59,7 +63,7 @@ public override void Think() { OnMultiNewMap.FireOutput(null, this); } - if ((SpawnFlags & SF_AUTO_FIREONCE) != 0) + if (HasSpawnFlags(SF.FireOnce)) Util.Remove(this); } } diff --git a/Game.Server/LogicEntities.cs b/Game.Server/LogicEntities.cs index fbc1cf88..b50118d3 100644 --- a/Game.Server/LogicEntities.cs +++ b/Game.Server/LogicEntities.cs @@ -97,7 +97,11 @@ public class TimerEntity : LogicalEntity // // Spawnflags and others constants. // - const int SF_TIMER_UPDOWN = 1; + [Flags] + public enum SF + { + UpDown = 1, + } const float LOGIC_TIMER_MIN_INTERVAL = 0.01f; // outputs @@ -187,7 +191,7 @@ public void FireTimer() { // // Up/down timers alternate between two outputs. // - if ((SpawnFlags & SF_TIMER_UPDOWN) != 0) { + if (HasSpawnFlags(SF.UpDown)) { if (UpDownState) OnTimerHigh.FireOutput(this, this); else @@ -383,8 +387,12 @@ public override void Think() { [LinkEntityToClass("math_remap")] public class MathRemap : LogicalEntity { - const int SF_MATH_REMAP_IGNORE_OUT_OF_RANGE = 1; - const int SF_MATH_REMAP_CLAMP_OUTPUT_TO_RANGE = 2; + [Flags] + public enum SF + { + IgnoreOutOfRange = 1, + ClampOutputToRange = 2, + } // Keys public float InMin; @@ -447,13 +455,13 @@ public void InputValue(InputData inputdata) { // float clampValue = Math.Clamp(value, InMin, InMax); - if ((clampValue == value) || (SpawnFlags & SF_MATH_REMAP_IGNORE_OUT_OF_RANGE) == 0) { + if ((clampValue == value) || !HasSpawnFlags(SF.IgnoreOutOfRange)) { // // Remap the input value to the desired output range and update the output. // float remappedValue = Out1 + (((value - InMin) * (Out2 - Out1)) / (InMax - InMin)); - if ((SpawnFlags & SF_MATH_REMAP_CLAMP_OUTPUT_TO_RANGE) != 0) + if (HasSpawnFlags(SF.ClampOutputToRange)) remappedValue = remappedValue < Out1 ? Out1 : remappedValue > Out2 ? Out2 : remappedValue; if (Enabled == true) @@ -468,7 +476,11 @@ public void InputValue(InputData inputdata) { [LinkEntityToClass("math_colorblend")] public class MathColorBlend : LogicalEntity { - const int SF_COLOR_BLEND_IGNORE_OUT_OF_RANGE = 1; + [Flags] + public enum SF + { + IgnoreOutOfRange = 1, + } // Keys public float InMin; @@ -517,7 +529,7 @@ public void InputValue(InputData inputdata) { // Disallow out-of-range input values to avoid out-of-range output values. // float clampValue = Math.Clamp(value, InMin, InMax); - if ((clampValue == value) || (SpawnFlags & SF_COLOR_BLEND_IGNORE_OUT_OF_RANGE) == 0) { + if ((clampValue == value) || !HasSpawnFlags(SF.IgnoreOutOfRange)) { // // Remap the input value to the desired output color and update the output. // @@ -562,7 +574,11 @@ public static void CC_Global_Set(in TokenizedCommand args) { GlobalEntity.Add(global, gpGlobals.MapName, (GlobalEState)newState); } - public const int SF_GLOBAL_SET = 1; // Set global state to initial state on spawn + [Flags] + public enum SF + { + Set = 1, // Set global state to initial state on spawn + } public readonly OutputInt OutCounter = new(); @@ -597,7 +613,7 @@ public override void Spawn() { return; } - if ((SpawnFlags & SF_GLOBAL_SET) != 0) { + if (HasSpawnFlags(SF.Set)) { if (!GlobalEntity.IsInTable(globalstate)) GlobalEntity.Add(globalstate, gpGlobals.MapName, (GlobalEState)initialstate); @@ -704,7 +720,11 @@ public override int DrawDebugTextOverlays() { public class MultiSource : LogicalEntity { public const int MS_MAX_TARGETS = 32; - public const int SF_MULTI_INIT = 1; + [Flags] + public enum SF + { + Init = 1, + } public readonly EHANDLE[] rgEntities = new EHANDLE[MS_MAX_TARGETS]; public readonly int[] rgTriggered = new int[MS_MAX_TARGETS]; @@ -752,7 +772,7 @@ public override bool KeyValue(ReadOnlySpan keyName, ReadOnlySpan val public override void Spawn() { SetNextThink(gpGlobals.CurTime + 0.1f); - SpawnFlags |= SF_MULTI_INIT; // Until it's initialized + AddSpawnFlags(SF.Init); // Until it's initialized SetThink(Register); } @@ -791,7 +811,7 @@ public bool IsTriggered(BaseEntity? activator) { int i = 0; // Still initializing? - if ((SpawnFlags & SF_MULTI_INIT) != 0) + if (HasSpawnFlags(SF.Init)) return false; while (i < Total) { @@ -837,7 +857,7 @@ public void Register() { target = gEntList.FindEntityByClassname(target, "multi_manager"); } - SpawnFlags &= ~SF_MULTI_INIT; + RemoveSpawnFlags(SF.Init); } } diff --git a/Game.Server/LogicRelay.cs b/Game.Server/LogicRelay.cs index b1d38dd6..1b9d15df 100644 --- a/Game.Server/LogicRelay.cs +++ b/Game.Server/LogicRelay.cs @@ -10,8 +10,12 @@ namespace Game.Server; [LinkEntityToClass("logic_relay")] public class LogicRelay : LogicalEntity { - const int SF_REMOVE_ON_FIRE = 0x001; - const int SF_ALLOW_FAST_RETRIGGER = 0x002; + [Flags] + public enum SF + { + RemoveOnFire = 0x001, + AllowFastRetrigger = 0x002, + } public OutputEvent OnTrigger = new(); public OutputEvent OnSpawn = new(); @@ -45,7 +49,7 @@ public override void Activate() { public override void Think() { OnSpawn.FireOutput(this, this); - if ((SpawnFlags & SF_REMOVE_ON_FIRE) != 0) + if (HasSpawnFlags(SF.RemoveOnFire)) Util.Remove(this); } @@ -66,9 +70,9 @@ public void InputTrigger(InputData inputdata) { if (!Disabled && !WaitForRefire) { OnTrigger.FireOutput(inputdata.Activator, this); - if ((SpawnFlags & SF_REMOVE_ON_FIRE) != 0) + if (HasSpawnFlags(SF.RemoveOnFire)) Util.Remove(this); - else if ((SpawnFlags & SF_ALLOW_FAST_RETRIGGER) == 0) { + else if (!HasSpawnFlags(SF.AllowFastRetrigger)) { WaitForRefire = true; g_EventQueue.AddEvent(this, "EnableRefire", OnTrigger.GetMaxDelay() + 0.001f, this, this); } diff --git a/Game.Server/NPCMaker.cs b/Game.Server/NPCMaker.cs index 0dedc4be..1df8a477 100644 --- a/Game.Server/NPCMaker.cs +++ b/Game.Server/NPCMaker.cs @@ -47,14 +47,18 @@ public void OnSpawnedNPC(AI_BaseNPC npc) { public abstract class BaseNPCMaker : BaseEntity { - public const int SF_NPCMAKER_START_ON = 1; - public const int SF_NPCMAKER_NPCCLIP = 8; - public const int SF_NPCMAKER_FADE = 16; - public const int SF_NPCMAKER_INF_CHILD = 32; - public const int SF_NPCMAKER_NO_DROP = 64; - public const int SF_NPCMAKER_HIDEFROMPLAYER = 128; - public const int SF_NPCMAKER_ALWAYSUSERADIUS = 256; - public const int SF_NPCMAKER_NOPRELOADMODELS = 512; + [Flags] + public enum SF + { + StartOn = 1, + NPCClip = 8, + Fade = 16, + InfChild = 32, + NoDrop = 64, + HideFromPlayer = 128, + AlwaysUseRadius = 256, + NoPreloadModels = 512, + } public static readonly ConVar ai_inhibit_spawners = new("ai_inhibit_spawners", "0", FCvar.Cheat); @@ -103,8 +107,8 @@ public override void Spawn() { LiveChildren = 0; Precache(); - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) != 0) - SpawnFlags |= SF_NPCMAKER_FADE; + if (HasSpawnFlags(SF.InfChild)) + AddSpawnFlags(SF.Fade); if (!Disabled) { SetThink(MakerThink); @@ -158,7 +162,7 @@ public bool CanMakeNPC(bool ignoreSolidEntities = false) { } } - if (HasSpawnFlags(SF_NPCMAKER_HIDEFROMPLAYER)) { + if (HasSpawnFlags(SF.HideFromPlayer)) { for (int i = 1; i <= gpGlobals.MaxClients; i++) { BasePlayer? player = Util.PlayerByIndex(i); if (player != null) { @@ -182,7 +186,7 @@ public override void DeathNotice(BaseEntity victim) { if (LiveChildren <= 0) { OnAllLiveChildrenDead.FireOutput(this, this); - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) == 0 && IsDepleted()) + if (!HasSpawnFlags(SF.InfChild) && IsDepleted()) OnAllSpawnedDead.FireOutput(this, this); } } @@ -216,7 +220,7 @@ public void MakerThink() { } public virtual bool IsDepleted() { - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) != 0 || MaxNumNPCs > 0) + if (HasSpawnFlags(SF.InfChild) || MaxNumNPCs > 0) return false; return true; @@ -308,10 +312,10 @@ public override void MakeNPC() { angles.Z = 0.0f; ent.SetAbsAngles(angles); - ent.AddSpawnFlags(SF_NPC_FALL_TO_GROUND); + ent.AddSpawnFlags(AI_BaseNPC.SF.FallToGround); - if ((SpawnFlags & SF_NPCMAKER_FADE) != 0) - ent.AddSpawnFlags(SF_NPC_FADE_CORPSE); + if (HasSpawnFlags(SF.Fade)) + ent.AddSpawnFlags(AI_BaseNPC.SF.FadeCorpse); ent.SpawnEquipment = SpawnEquipment; ent.SquadName = SquadName; @@ -330,7 +334,7 @@ public override void MakeNPC() { LiveChildren++; - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) == 0) { + if (!HasSpawnFlags(SF.InfChild)) { MaxNumNPCs--; if (IsDepleted()) { @@ -529,7 +533,7 @@ public override void Precache() { } public override void MakeNPC() { - if (Radius != 0 && HasSpawnFlags(SF_NPCMAKER_ALWAYSUSERADIUS)) { + if (Radius != 0 && HasSpawnFlags(SF.AlwaysUseRadius)) { MakeNPCInRadius(); return; } @@ -577,13 +581,13 @@ public override void MakeNPC() { OnSpawnNPC.Set(entity!.GetRefEHandle(), entity, this); - if ((SpawnFlags & SF_NPCMAKER_FADE) != 0) - ent.AddSpawnFlags(SF_NPC_FADE_CORPSE); + if (HasSpawnFlags(SF.Fade)) + ent.AddSpawnFlags(AI_BaseNPC.SF.FadeCorpse); - ent.RemoveSpawnFlags(SF_NPC_TEMPLATE); + ent.RemoveSpawnFlags(AI_BaseNPC.SF.Template); - if ((SpawnFlags & SF_NPCMAKER_NO_DROP) == 0) - ent.RemoveSpawnFlags(SF_NPC_FALL_TO_GROUND); + if (!HasSpawnFlags(SF.NoDrop)) + ent.RemoveSpawnFlags(AI_BaseNPC.SF.FallToGround); ChildPreSpawn(ent); @@ -595,7 +599,7 @@ public override void MakeNPC() { LiveChildren++; - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) == 0) { + if (!HasSpawnFlags(SF.InfChild)) { MaxNumNPCs--; if (IsDepleted()) { @@ -625,9 +629,9 @@ public void MakeNPCInLine() { PlaceNPCInLine(ent); - ent.AddSpawnFlags(SF_NPC_FALL_TO_GROUND); + ent.AddSpawnFlags(AI_BaseNPC.SF.FallToGround); - ent.RemoveSpawnFlags(SF_NPC_TEMPLATE); + ent.RemoveSpawnFlags(AI_BaseNPC.SF.Template); ChildPreSpawn(ent); @@ -639,7 +643,7 @@ public void MakeNPCInLine() { LiveChildren++; - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) == 0) { + if (!HasSpawnFlags(SF.InfChild)) { MaxNumNPCs--; if (IsDepleted()) { @@ -698,9 +702,9 @@ public void MakeNPCInRadius() { OnSpawnNPC.Set(entity!.GetRefEHandle(), entity, this); - ent.AddSpawnFlags(SF_NPC_FALL_TO_GROUND); + ent.AddSpawnFlags(AI_BaseNPC.SF.FallToGround); - ent.RemoveSpawnFlags(SF_NPC_TEMPLATE); + ent.RemoveSpawnFlags(AI_BaseNPC.SF.Template); ChildPreSpawn(ent); @@ -712,7 +716,7 @@ public void MakeNPCInRadius() { LiveChildren++; - if ((SpawnFlags & SF_NPCMAKER_INF_CHILD) == 0) { + if (!HasSpawnFlags(SF.InfChild)) { MaxNumNPCs--; if (IsDepleted()) { diff --git a/Game.Server/NPC_Breen.cs b/Game.Server/NPC_Breen.cs index 6a19368a..b7d43598 100644 --- a/Game.Server/NPC_Breen.cs +++ b/Game.Server/NPC_Breen.cs @@ -12,7 +12,11 @@ namespace Game.Server; [LinkEntityToClass("npc_breen")] public class NPC_Breen : AI_BaseActor { - public const int SF_BREEN_BACKGROUND_TALK = 1 << 16; + [Flags] + public enum SF + { + BackgroundTalk = 1 << 16, + } public override void Spawn( ){ // Breen is allowed to use multiple models, because he has a torso version for monitors. @@ -52,5 +56,5 @@ public override void Precache( ){ public override Class_T Classify() => Class_T.None; public override void HandleAnimEvent(ref AnimEvent ev) => base.HandleAnimEvent(ref ev); // not sure why this was overridden? public override int GetSoundInterests() => 0; - public override bool UseSemaphore() => HasSpawnFlags(SF_BREEN_BACKGROUND_TALK) ? false : base.UseSemaphore(); + public override bool UseSemaphore() => HasSpawnFlags(SF.BackgroundTalk) ? false : base.UseSemaphore(); } diff --git a/Game.Server/NPC_Citizen.cs b/Game.Server/NPC_Citizen.cs index bb6f18ca..32f9e125 100644 --- a/Game.Server/NPC_Citizen.cs +++ b/Game.Server/NPC_Citizen.cs @@ -36,15 +36,19 @@ public enum CitizenExpressionType [LinkEntityToClass("npc_citizen")] public class NPC_Citizen : NPC_PlayerCompanion { - public const int SF_CITIZEN_FOLLOW = 1 << 16; - public const int SF_CITIZEN_MEDIC = 1 << 17; - public const int SF_CITIZEN_RANDOM_HEAD = 1 << 18; - public const int SF_CITIZEN_AMMORESUPPLIER = 1 << 19; - public const int SF_CITIZEN_NOT_COMMANDABLE = 1 << 20; - public const int SF_CITIZEN_IGNORE_SEMAPHORE = 1 << 21; - public const int SF_CITIZEN_RANDOM_HEAD_MALE = 1 << 22; - public const int SF_CITIZEN_RANDOM_HEAD_FEMALE = 1 << 23; - public const int SF_CITIZEN_USE_RENDER_BOUNDS = 1 << 24; + [Flags] + public enum SF + { + Follow = 1 << 16, + Medic = 1 << 17, + RandomHead = 1 << 18, + AmmoResupplier = 1 << 19, + NotCommandable = 1 << 20, + IgnoreSemaphore = 1 << 21, + RandomHeadMale = 1 << 22, + RandomHeadFemale = 1 << 23, + UseRenderBounds = 1 << 24, + } const int CIT_INSPECTED_DELAY_TIME = 120; @@ -285,8 +289,8 @@ public class NPC_Citizen : NPC_PlayerCompanion ], }; - public bool IsMedic() => HasSpawnFlags(SF_CITIZEN_MEDIC); - public bool IsAmmoResupplier() => HasSpawnFlags(SF_CITIZEN_AMMORESUPPLIER); + public bool IsMedic() => HasSpawnFlags(SF.Medic); + public bool IsAmmoResupplier() => HasSpawnFlags(SF.AmmoResupplier); public override void Precache() { SelectModel(); @@ -362,7 +366,7 @@ public override void Spawn() { NPCInit(); - ActBusyBehavior.SetUseRenderBounds(HasSpawnFlags(SF_CITIZEN_USE_RENDER_BOUNDS)); + ActBusyBehavior.SetUseRenderBounds(HasSpawnFlags(SF.UseRenderBounds)); } public override void SelectModel() { @@ -390,13 +394,13 @@ public override void SelectModel() { Type = CitizenType.Downtrodden; } - if (HasSpawnFlags(SF_CITIZEN_RANDOM_HEAD | SF_CITIZEN_RANDOM_HEAD_MALE | SF_CITIZEN_RANDOM_HEAD_FEMALE) || GetModelName().IsEmpty) { + if (HasSpawnFlags(SF.RandomHead | SF.RandomHeadMale | SF.RandomHeadFemale) || GetModelName().IsEmpty) { Assert(Head == -1); - char gender = HasSpawnFlags(SF_CITIZEN_RANDOM_HEAD_MALE) ? 'm' : - HasSpawnFlags(SF_CITIZEN_RANDOM_HEAD_FEMALE) ? 'f' : '\0'; + char gender = HasSpawnFlags(SF.RandomHeadMale) ? 'm' : + HasSpawnFlags(SF.RandomHeadFemale) ? 'f' : '\0'; - RemoveSpawnFlags(SF_CITIZEN_RANDOM_HEAD | SF_CITIZEN_RANDOM_HEAD_MALE | SF_CITIZEN_RANDOM_HEAD_FEMALE); - if (HasSpawnFlags(SF_NPC_START_EFFICIENT)) { + RemoveSpawnFlags(SF.RandomHead | SF.RandomHeadMale | SF.RandomHeadFemale); + if (HasSpawnFlags(AI_BaseNPC.SF.StartEfficient)) { SetModelName("models/humans/male_cheaple.mdl"); return; } @@ -543,7 +547,7 @@ public override int TranslateSchedule(int scheduleType) { float dist = (localPlayer.GetAbsOrigin() - GetAbsOrigin()).Length(); if (dist < 50 * 12) { - AddSpawnFlags(SF_CITIZEN_NOT_COMMANDABLE); + AddSpawnFlags(SF.NotCommandable); return SCHED_CITIZEN_MOURN_PLAYER; } } @@ -746,7 +750,7 @@ public bool CanJoinPlayerSquad() { if (NPCState == NPCState.Script || NPCState == NPCState.Prone) return false; - if (HasSpawnFlags(SF_CITIZEN_NOT_COMMANDABLE)) + if (HasSpawnFlags(SF.NotCommandable)) return false; if (IsInAScript()) diff --git a/Game.Server/NPC_MetroPolice.cs b/Game.Server/NPC_MetroPolice.cs index 5e53f43c..6b959d12 100644 --- a/Game.Server/NPC_MetroPolice.cs +++ b/Game.Server/NPC_MetroPolice.cs @@ -20,14 +20,18 @@ namespace Game.Server; [LinkEntityToClass("npc_metropolice")] public class NPC_MetroPolice : AI_BaseActor { - public const int SF_METROPOLICE_SIMPLE_VERSION = 0x00020000; - public const int SF_METROPOLICE_ALWAYS_STITCH = 0x00080000; - public const int SF_METROPOLICE_NOCHATTER = 0x00100000; - public const int SF_METROPOLICE_ARREST_ENEMY = 0x00200000; - public const int SF_METROPOLICE_NO_FAR_STITCH = 0x00400000; - public const int SF_METROPOLICE_NO_MANHACK_DEPLOY = 0x00800000; - public const int SF_METROPOLICE_ALLOWED_TO_RESPOND = 0x01000000; - public const int SF_METROPOLICE_MID_RANGE_ATTACK = 0x02000000; + [Flags] + public enum SF + { + SimpleVersion = 0x00020000, + AlwaysStitch = 0x00080000, + NoChatter = 0x00100000, + ArrestEnemy = 0x00200000, + NoFarStitch = 0x00400000, + NoManhackDeploy = 0x00800000, + AllowedToRespond = 0x01000000, + MidRangeAttack = 0x02000000, + } public const float METROPOLICE_MID_RANGE_ATTACK_RANGE = 3500.0f; @@ -817,7 +821,7 @@ public override void PrescheduleThink() { } public override void Precache() { - if (HasSpawnFlags(SF_NPC_START_EFFICIENT)) + if (HasSpawnFlags(AI_BaseNPC.SF.StartEfficient)) SetModelName("models/police_cheaple.mdl"); else SetModelName("models/police.mdl"); @@ -855,9 +859,9 @@ public override void Spawn() { SetMoveType(Source.MoveType.Step); SetBloodColor(Shared.BloodColor.Red); IdleChatterType = METROPOLICE_CHATTER_ASK_QUESTION; - SimpleCops = HasSpawnFlags(SF_METROPOLICE_SIMPLE_VERSION); - if (HasSpawnFlags(SF_METROPOLICE_NOCHATTER)) - AddSpawnFlags(SF_NPC_GAG); + SimpleCops = HasSpawnFlags(SF.SimpleVersion); + if (HasSpawnFlags(SF.NoChatter)) + AddSpawnFlags(AI_BaseNPC.SF.Gag); if (!SimpleCops) Health = (int)sk_metropolice_health.GetFloat(); @@ -866,7 +870,7 @@ public override void Spawn() { FieldOfView = -0.2f; NPCState = NPCState.None; - if (!HasSpawnFlags(SF_NPC_START_EFFICIENT)) { + if (!HasSpawnFlags(AI_BaseNPC.SF.StartEfficient)) { CapabilitiesAdd(Capability.TurnHead | Capability.AnimatedFace); CapabilitiesAdd(Capability.AimGun | Capability.MoveShoot); } @@ -880,7 +884,7 @@ public override void Spawn() { NPCInit(); - if (HasSpawnFlags(SF_METROPOLICE_MID_RANGE_ATTACK)) { + if (HasSpawnFlags(SF.MidRangeAttack)) { DistTooFar = METROPOLICE_MID_RANGE_ATTACK_RANGE; SetDistLook(METROPOLICE_MID_RANGE_ATTACK_RANGE); } @@ -903,10 +907,10 @@ public override void Spawn() { NextLedgeCheckTime = -1.0f; BurstReloadCount = METROPOLICE_BURST_RELOAD_COUNT; - if (HasSpawnFlags(SF_METROPOLICE_ALWAYS_STITCH)) { + if (HasSpawnFlags(SF.AlwaysStitch)) { if (Weapon_OwnsThisType("weapon_smg1", 0) == null) { Warning("Warning! Metrocop is trying to use the stitch behavior but he has no smg1!\n"); - RemoveSpawnFlags(SF_METROPOLICE_ALWAYS_STITCH); + RemoveSpawnFlags(SF.AlwaysStitch); } } @@ -926,7 +930,7 @@ public override void Spawn() { public override void Weapon_Equip(BaseCombatWeapon weapon) { base.Weapon_Equip(weapon); - if (HasSpawnFlags(SF_METROPOLICE_MID_RANGE_ATTACK) && GetActiveWeapon() != null) { + if (HasSpawnFlags(SF.MidRangeAttack) && GetActiveWeapon() != null) { GetActiveWeapon()!.MaxRange1 = METROPOLICE_MID_RANGE_ATTACK_RANGE; GetActiveWeapon()!.MaxRange2 = METROPOLICE_MID_RANGE_ATTACK_RANGE; } @@ -966,7 +970,7 @@ public override void SpeakSentence(int sentenceType) { case METROPOLICE_SENTENCE_MOVE_INTO_POSITION: { BaseEntity? entity = GetEnemy(); - if (entity != null && !HasSpawnFlags(SF_METROPOLICE_ARREST_ENEMY)) { + if (entity != null && !HasSpawnFlags(SF.ArrestEnemy)) { if (entity.IsPlayer() && (entity.GetHealth() <= 20)) { if (!HasMemory(bits_MEMORY_PLAYER_HURT)) { if (Sentences.Speak("METROPOLICE_PLAYERHIT", SentencePriority.High) >= 0) @@ -1075,8 +1079,8 @@ public override bool CreateBehaviors() { } public void InputEnableManhackToss(InputData inputdata) { - if (HasSpawnFlags(SF_METROPOLICE_NO_MANHACK_DEPLOY)) - RemoveSpawnFlags(SF_METROPOLICE_NO_MANHACK_DEPLOY); + if (HasSpawnFlags(SF.NoManhackDeploy)) + RemoveSpawnFlags(SF.NoManhackDeploy); } public void InputSetPoliceGoal(InputData inputdata) { @@ -1122,7 +1126,7 @@ public override void LostEnemySound() { } public override void FoundEnemySound() { - if (HasSpawnFlags(SF_METROPOLICE_ARREST_ENEMY)) + if (HasSpawnFlags(SF.ArrestEnemy)) return; Sentences.Speak("METROPOLICE_REFIND_ENEMY", SentencePriority.High); @@ -1452,7 +1456,7 @@ void AdministerJustice() { if (!AI_IsSinglePlayer()) return; - if (!IsInAScript() && (NPCState != NPCState.Script) && HasSpawnFlags(SF_METROPOLICE_ALLOWED_TO_RESPOND)) { + if (!IsInAScript() && (NPCState != NPCState.Script) && HasSpawnFlags(SF.AllowedToRespond)) { if (PreChaseOrigin == vec3_origin) { PreChaseOrigin = GetAbsOrigin(); PreChaseYaw = GetAbsAngles().Y; @@ -1475,7 +1479,7 @@ void AdministerJustice() { if (ais[i].Classify() == Class_T.MetroPolice && FClassnameIs(ais[i], "npc_metropolice")) { NPC_MetroPolice npc = (NPC_MetroPolice)ais[i]; - if (npc.HasSpawnFlags(SF_METROPOLICE_ALLOWED_TO_RESPOND)) { + if (npc.HasSpawnFlags(SF.AllowedToRespond)) { BasePlayer? player = AI_GetClosestPlayer(); if (FVisible(npc) && player != null && npc.FVisible(player) && Util.DistApprox(WorldSpaceCenter(), npc.WorldSpaceCenter()) < 512) { @@ -1809,7 +1813,7 @@ public override void StartTask(in Task_t task) { throw new NotImplementedException(); case TASK_METROPOLICE_HARASS: { - if ((SpawnFlags & SF_METROPOLICE_NOCHATTER) == 0) { + if (!HasSpawnFlags(SF.NoChatter)) { if (GetEnemy() != null && GetEnemy()!.GetWaterLevel() > 0) EmitSound("NPC_MetroPolice.WaterSpeech"); else @@ -1838,7 +1842,7 @@ void EnemyResistingArrest() { if (Squad != null) { AI_BaseNPC? squadmate = Squad.GetFirstMember(out int iter); while (squadmate != null) { - squadmate.RemoveSpawnFlags(SF_METROPOLICE_ARREST_ENEMY); + squadmate.RemoveSpawnFlags(SF.ArrestEnemy); squadmate.SetCondition(COND_METROPOLICE_ENEMY_RESISTING_ARREST); squadmate = Squad.GetNextMember(ref iter); } @@ -1931,7 +1935,7 @@ public override void RunTask(in Task_t task) { } bool CanDeployManhack() { - if (HasSpawnFlags(SF_METROPOLICE_NO_MANHACK_DEPLOY)) + if (HasSpawnFlags(SF.NoManhackDeploy)) return false; if (Manhack.Get() != null) diff --git a/Game.Server/NPC_PlayerCompanion.cs b/Game.Server/NPC_PlayerCompanion.cs index 6777e127..d76bb40c 100644 --- a/Game.Server/NPC_PlayerCompanion.cs +++ b/Game.Server/NPC_PlayerCompanion.cs @@ -239,7 +239,7 @@ public override void Spawn() { CapabilitiesClear(); CapabilitiesAdd(Capability.Squad); - if (!HasSpawnFlags(SF_NPC_START_EFFICIENT)) { + if (!HasSpawnFlags(AI_BaseNPC.SF.StartEfficient)) { CapabilitiesAdd(Capability.AnimatedFace | Capability.TurnHead); CapabilitiesAdd(Capability.UseWeapons | Capability.AimGun | Capability.MoveShoot); CapabilitiesAdd(Capability.Duck | Capability.AutoDoors | Capability.OpenDoors); @@ -254,9 +254,9 @@ public override void Spawn() { SetReadinessSensitivity(random.RandomFloat(0.7f, 1.3f)); ReadinessLockedUntil = 0.0f; - if (HasSpawnFlags(SF_NPC_ALTCOLLISION)) { + if (HasSpawnFlags(AI_BaseNPC.SF.AltCollision)) { Warning($"NPC {GetEntityName()} using alternate collision! -- DISABLED\n"); - RemoveSpawnFlags(SF_NPC_ALTCOLLISION); + RemoveSpawnFlags(AI_BaseNPC.SF.AltCollision); } base.Spawn(); diff --git a/Game.Server/PathTrack.cs b/Game.Server/PathTrack.cs index 7a9f48c1..f9f3f45d 100644 --- a/Game.Server/PathTrack.cs +++ b/Game.Server/PathTrack.cs @@ -21,13 +21,17 @@ public enum TrackOrientationType [LinkEntityToClass("path_track")] public class PathTrack : PointEntity { - public const int SF_PATH_DISABLED = 0x00000001; - public const int SF_PATH_ALTREVERSE = 0x00000004; - public const int SF_PATH_DISABLE_TRAIN = 0x00000008; - public const int SF_PATH_TELEPORT = 0x00000010; - public const int SF_PATH_UPHILL = 0x00000020; - public const int SF_PATH_DOWNHILL = 0x00000040; - public const int SF_PATH_ALTERNATE = 0x00008000; + [Flags] + public enum SF + { + Disabled = 0x00000001, + AltReverse = 0x00000004, + DisableTrain = 0x00000008, + Teleport = 0x00000010, + Uphill = 0x00000020, + Downhill = 0x00000040, + Alternate = 0x00008000, + } public Handle Next = new(); public Handle Previous = new(); @@ -133,7 +137,7 @@ public static void EndIteration() { public void ToggleAlternatePath() { if (AltPath.Get() != null) { - if ((SpawnFlags & SF_PATH_ALTERNATE) == 0) + if (!HasSpawnFlags(SF.Alternate)) EnableAlternatePath(); else DisableAlternatePath(); @@ -142,12 +146,12 @@ public void ToggleAlternatePath() { public void EnableAlternatePath() { if (AltPath.Get() != null) - SpawnFlags |= SF_PATH_ALTERNATE; + AddSpawnFlags(SF.Alternate); } public void DisableAlternatePath() { if (AltPath.Get() != null) - SpawnFlags &= ~SF_PATH_ALTERNATE; + RemoveSpawnFlags(SF.Alternate); } public void InputEnableAlternatePath(InputData inputdata) => EnableAlternatePath(); @@ -157,15 +161,15 @@ public void DisableAlternatePath() { public void InputToggleAlternatePath(InputData inputdata) => ToggleAlternatePath(); public void TogglePath() { - if ((SpawnFlags & SF_PATH_DISABLED) != 0) + if (HasSpawnFlags(SF.Disabled)) EnablePath(); else DisablePath(); } - public void EnablePath() => SpawnFlags &= ~SF_PATH_DISABLED; + public void EnablePath() => RemoveSpawnFlags(SF.Disabled); - public void DisablePath() => SpawnFlags |= SF_PATH_DISABLED; + public void DisablePath() => AddSpawnFlags(SF.Disabled); public void InputEnablePath(InputData inputdata) => EnablePath(); @@ -177,7 +181,7 @@ public void TogglePath() { if (path == null) return null; - if (testFlag != 0 && (path.SpawnFlags & SF_PATH_DISABLED) != 0) + if (testFlag != 0 && path.HasSpawnFlags(SF.Disabled)) return null; return path; @@ -207,14 +211,14 @@ void Project(PathTrack? start, PathTrack? end, ref Vector3 origin, float dist) { } public PathTrack? GetNext() { - if (AltPath.Get() != null && (SpawnFlags & SF_PATH_ALTERNATE) != 0 && (SpawnFlags & SF_PATH_ALTREVERSE) == 0) + if (AltPath.Get() != null && HasSpawnFlags(SF.Alternate) && !HasSpawnFlags(SF.AltReverse)) return AltPath.Get(); return Next.Get(); } public PathTrack? GetPrevious() { - if (AltPath.Get() != null && (SpawnFlags & SF_PATH_ALTERNATE) != 0 && (SpawnFlags & SF_PATH_ALTREVERSE) != 0) + if (AltPath.Get() != null && HasSpawnFlags(SF.Alternate) && HasSpawnFlags(SF.AltReverse)) return AltPath.Get(); return Previous.Get(); @@ -339,8 +343,8 @@ public QAngle GetOrientation(bool forwardDir) { public float GetRadius() => Radius; - public bool IsUpHill() => (SpawnFlags & SF_PATH_UPHILL) != 0; - public bool IsDownHill() => (SpawnFlags & SF_PATH_DOWNHILL) != 0; + public bool IsUpHill() => HasSpawnFlags(SF.Uphill); + public bool IsDownHill() => HasSpawnFlags(SF.Downhill); public HillType GetHillType() { HillType retVal = HillType.None; @@ -352,7 +356,7 @@ public HillType GetHillType() { return retVal; } - public bool IsDisabled() => (SpawnFlags & SF_PATH_DISABLED) != 0; + public bool IsDisabled() => HasSpawnFlags(SF.Disabled); public void InputPass(InputData inputdata) => OnPass.FireOutput(inputdata.Activator, this); diff --git a/Game.Server/PhysObj.cs b/Game.Server/PhysObj.cs index 9c747d0e..d6954672 100644 --- a/Game.Server/PhysObj.cs +++ b/Game.Server/PhysObj.cs @@ -17,7 +17,11 @@ namespace Game.Server; [NetworkName("CPhysBox")] public class PhysBox : Breakable { - public const int SF_PHYSBOX_ENABLE_ON_PHYSCANNON = 0x20000; + [Flags] + public enum SF + { + EnableOnPhyscannon = 0x20000, + } public static readonly SendTable DT_PhysBox = new(DT_BaseEntity, []); public static readonly new ServerClass ServerClass = new ServerClass(DT_PhysBox); diff --git a/Game.Server/Player.cs b/Game.Server/Player.cs index 2282ba61..e48a3fd8 100644 --- a/Game.Server/Player.cs +++ b/Game.Server/Player.cs @@ -248,7 +248,11 @@ public enum PlayerPhysFlag [NetworkName("CBasePlayer")] public partial class BasePlayer : BaseCombatCharacter { - public const int SF_NORESPAWN = 1 << 30; + [Flags] + public enum SF + { + NoRespawn = 1 << 30, + } public const float DOT_30DEGREE = 0.866025403784f; public const float DOT_45DEGREE = 0.707106781187f; public static readonly SendTable DT_PlayerState = new(nameof(DT_PlayerState), [ @@ -1978,10 +1982,10 @@ public static bool CanPickupObject(BaseEntity? obj, float massLimit, float sizeL if (prop == null && box == null) return false; - if (prop != null && !(prop.HasSpawnFlags(SF_PHYSPROP_ENABLE_ON_PHYSCANNON))) + if (prop != null && !(prop.HasSpawnFlags(BreakableProp.SF.EnableOnPhyscannon))) return false; - if (box != null && !(box.HasSpawnFlags(PhysBox.SF_PHYSBOX_ENABLE_ON_PHYSCANNON))) + if (box != null && !(box.HasSpawnFlags(PhysBox.SF.EnableOnPhyscannon))) return false; } diff --git a/Game.Server/PointTeleport.cs b/Game.Server/PointTeleport.cs index ccb313e7..d1fbb0c1 100644 --- a/Game.Server/PointTeleport.cs +++ b/Game.Server/PointTeleport.cs @@ -13,7 +13,11 @@ namespace Game.Server; [LinkEntityToClass("point_teleport")] public class PointTeleport : BaseEntity { - const int SF_TELEPORT_TO_SPAWN_POS = 0x00000001; + [Flags] + public enum SF + { + ToSpawnPos = 0x00000001, + } Vector3 SaveOrigin; QAngle SaveAngles; @@ -40,7 +44,7 @@ public override void Activate() { SaveOrigin = GetAbsOrigin(); SaveAngles = GetAbsAngles(); - if ((SpawnFlags & SF_TELEPORT_TO_SPAWN_POS) != 0) { + if (HasSpawnFlags(SF.ToSpawnPos)) { BaseEntity? target = gEntList.FindEntityByName(null, Target); if (target != null) { if (EntityMayTeleport(target)) { diff --git a/Game.Server/PointViewControl.cs b/Game.Server/PointViewControl.cs index 82b8b809..a417483d 100644 --- a/Game.Server/PointViewControl.cs +++ b/Game.Server/PointViewControl.cs @@ -15,13 +15,17 @@ namespace Game.Server; [LinkEntityToClass("point_viewcontrol")] public class PointViewControl : BaseEntity { - const int SF_CAMERA_PLAYER_POSITION = 1; - const int SF_CAMERA_PLAYER_TARGET = 2; - const int SF_CAMERA_PLAYER_TAKECONTROL = 4; - const int SF_CAMERA_PLAYER_INFINITE_WAIT = 8; - const int SF_CAMERA_PLAYER_SNAP_TO = 16; - const int SF_CAMERA_PLAYER_NOT_SOLID = 32; - const int SF_CAMERA_PLAYER_INTERRUPT = 64; + [Flags] + public enum SF + { + PlayerPosition = 1, + PlayerTarget = 2, + TakeControl = 4, + InfiniteWait = 8, + SnapTo = 16, + NotSolid = 32, + Interrupt = 64, + } EHANDLE Player = new(); EHANDLE TargetEnt = new(); @@ -167,17 +171,17 @@ public void Enable() { OldTakeDamage = Player.Get()!.m_takedamage; Player.Get()!.m_takedamage = (byte)Damage.No; - if (HasSpawnFlags(SF_CAMERA_PLAYER_NOT_SOLID)) + if (HasSpawnFlags(SF.NotSolid)) Player.Get()!.AddSolidFlags(SolidFlags.NotSolid); ReturnTime = gpGlobals.CurTime + Wait; Speed = InitialSpeed; TargetSpeed = InitialSpeed; - if (HasSpawnFlags(SF_CAMERA_PLAYER_SNAP_TO)) + if (HasSpawnFlags(SF.SnapTo)) SnapToGoal = true; - if (HasSpawnFlags(SF_CAMERA_PLAYER_TARGET)) + if (HasSpawnFlags(SF.PlayerTarget)) TargetEnt.Set(Player.Get()); else TargetEnt.Set(GetNextTarget()); @@ -196,7 +200,7 @@ public void Enable() { } } - if (HasSpawnFlags(SF_CAMERA_PLAYER_TAKECONTROL)) + if (HasSpawnFlags(SF.TakeControl)) ((BasePlayer)Player.Get()!).EnableControl(false); if (!string.IsNullOrEmpty(PathName)) @@ -212,7 +216,7 @@ public void Enable() { StopTime += Path is BaseToggle toggle ? toggle.GetDelay() : 0; } - if (HasSpawnFlags(SF_CAMERA_PLAYER_POSITION)) { + if (HasSpawnFlags(SF.PlayerPosition)) { Util.SetOrigin(this, Player.Get()!.EyePosition()); SetLocalAngles(new QAngle(Player.Get()!.GetLocalAngles().X, Player.Get()!.GetLocalAngles().Y, 0)); SetAbsVelocity(Player.Get()!.GetAbsVelocity()); @@ -239,7 +243,7 @@ public void Disable() { if (Player.Get() != null && Player.Get()!.IsAlive()) { BasePlayer player = (BasePlayer)Player.Get()!; - if (HasSpawnFlags(SF_CAMERA_PLAYER_NOT_SOLID)) + if (HasSpawnFlags(SF.NotSolid)) player.RemoveSolidFlags(SolidFlags.NotSolid); player.SetViewEntity(player); @@ -282,7 +286,7 @@ void FollowTarget() { return; } - if (!HasSpawnFlags(SF_CAMERA_PLAYER_INFINITE_WAIT) && (target == null || ReturnTime < gpGlobals.CurTime)) { + if (!HasSpawnFlags(SF.InfiniteWait) && (target == null || ReturnTime < gpGlobals.CurTime)) { Disable(); return; } @@ -331,7 +335,7 @@ void FollowTarget() { SetLocalAngularVelocity(vecAngVel); } - if (!HasSpawnFlags(SF_CAMERA_PLAYER_TAKECONTROL)) { + if (!HasSpawnFlags(SF.TakeControl)) { SetAbsVelocity(GetAbsVelocity() * 0.8f); if (GetAbsVelocity().Length() < 10.0f) SetAbsVelocity(vec3_origin); @@ -343,7 +347,7 @@ void FollowTarget() { } void Move() { - if (HasSpawnFlags(SF_CAMERA_PLAYER_INTERRUPT)) { + if (HasSpawnFlags(SF.Interrupt)) { if (Player.Get() != null) { BasePlayer? player = ToBasePlayer(Player.Get()); diff --git a/Game.Server/Props.cs b/Game.Server/Props.cs index 50f31013..f85907c0 100644 --- a/Game.Server/Props.cs +++ b/Game.Server/Props.cs @@ -60,6 +60,29 @@ public void ParsePropData() { } [NetworkName("CBreakableProp")] public class BreakableProp : BaseProp, IBreakableWithPropData, IPlayerPickupVPhysics { + [Flags] + public enum SF + { + StartAsleep = 0x000001, + DontTakePhysicsDamage = 0x000002,// this prop can't be damaged by physics collisions + Debris = 0x000004, + MotionDisabled = 0x000008,// motion disabled at startup (flag only valid in spawn - motion can be enabled via input) + Touch = 0x000010,// can be 'crashed through' by running player (plate glass) + Pressure = 0x000020,// can be broken by a player standing on it + EnableOnPhyscannon = 0x000040,// enable motion only if the player grabs it with the physcannon + NoRotorwashPush = 0x000080,// The rotorwash doesn't push these + EnablePickupOutput = 0x000100,// If set, allow the player to +USE this for the purposes of generating an output + PreventPickup = 0x000200,// If set, prevent +USE/Physcannon pickup of this prop + PreventPlayerTouchEnable = 0x000400,// If set, the player will not cause the object to enable its motion when bumped into + HasAttachedRagdolls = 0x000800,// Need to remove attached ragdolls on enable motion/etc + ForceTouchTriggers = 0x001000,// Override normal debris behavior and respond to triggers anyway + ForceServerSide = 0x002000,// Force multiplayer physics object to be serverside + RadiusPickup = 0x004000,// For Xbox, makes small objects easier to pick up by allowing them to be found + AlwaysPickUp = 0x100000,// Physcannon can always pick this up, no matter what mass or constraints may apply. + NoCollisions = 0x200000,// Don't enable collisions on spawn + IsGib = 0x400000,// Limit # of active gibs + } + public static readonly SendTable DT_BreakableProp = new(DT_BaseAnimating, []); public static readonly new ServerClass ServerClass = new ServerClass(DT_BreakableProp); @@ -125,7 +148,7 @@ public virtual void PlayPuntSound() { } public void CheckRemoveRagdolls() { - if (HasSpawnFlags(SF_PHYSPROP_HAS_ATTACHED_RAGDOLLS)) + if (HasSpawnFlags(SF.HasAttachedRagdolls)) throw new NotImplementedException(); } @@ -342,7 +365,7 @@ public override void OnPhysGunPickup(BasePlayer physGunUser, PhysGunPickup reaso IPhysicsObject? physicsObject = VPhysicsGetObject(); if (physicsObject != null && !physicsObject.IsMoveable()) { - if (!HasSpawnFlags(SF_PHYSPROP_ENABLE_ON_PHYSCANNON)) + if (!HasSpawnFlags(SF.EnableOnPhyscannon)) return; EnableMotion(); @@ -382,14 +405,14 @@ public override void OnPhysGunDrop(BasePlayer physGunUser, PhysGunDrop reason) { } public override void Term() { - if (HasSpawnFlags(SF_PHYSPROP_IS_GIB)) + if (HasSpawnFlags(SF.IsGib)) g_ActiveGibCount--; base.Term(); } public override void Spawn() { - if (HasSpawnFlags(SF_PHYSPROP_IS_GIB)) + if (HasSpawnFlags(SF.IsGib)) g_ActiveGibCount++; // Condense classnames to one, except for "prop_physics_override" @@ -405,10 +428,10 @@ public override void Spawn() { if (FClassnameIs(this, "prop_physics_override")) SetClassname("prop_physics"); - if (HasSpawnFlags(SF_PHYSPROP_DEBRIS) || HasInteraction(PropDataInteractions.PhysgunCreateFlare)) - SetCollisionGroup(HasSpawnFlags(SF_PHYSPROP_FORCE_TOUCH_TRIGGERS) ? Source.CollisionGroup.DebrisTrigger : Source.CollisionGroup.Debris); + if (HasSpawnFlags(SF.Debris) || HasInteraction(PropDataInteractions.PhysgunCreateFlare)) + SetCollisionGroup(HasSpawnFlags(SF.ForceTouchTriggers) ? Source.CollisionGroup.DebrisTrigger : Source.CollisionGroup.Debris); - if (HasSpawnFlags(SF_PHYSPROP_NO_ROTORWASH_PUSH)) + if (HasSpawnFlags(SF.NoRotorwashPush)) AddEFlags(EFL.NoRotorWashPush); CreateVPhysics(); @@ -430,10 +453,10 @@ public static bool PropIsGib(BaseEntity entity) { return false; } - public bool IsGib() => (SpawnFlags & SF_PHYSPROP_IS_GIB) != 0; + public bool IsGib() => HasSpawnFlags(SF.IsGib); public virtual bool CreateVPhysics() { - bool asleep = HasSpawnFlags(SF_PHYSPROP_START_ASLEEP); + bool asleep = HasSpawnFlags(SF.StartAsleep); Solid tmpSolid = default; PhysModelParseSolid(ref tmpSolid, this, GetModelIndex()); @@ -448,7 +471,7 @@ public virtual bool CreateVPhysics() { } PhysGetMassCenterOverride(this, modelinfo.GetVCollide(GetModelIndex()), ref tmpSolid); - if (HasSpawnFlags(SF_PHYSPROP_NO_COLLISIONS)) + if (HasSpawnFlags(SF.NoCollisions)) tmpSolid.Params.EnableCollisions = false; PhysSolidOverride(ref tmpSolid, OverrideScript); @@ -465,7 +488,7 @@ public virtual bool CreateVPhysics() { if (DamageType == 1) PhysSetGameFlags(physicsObject, PhysicsFlags.DamageSlice); - if (HasSpawnFlags(SF_PHYSPROP_MOTIONDISABLED) || DamageToEnableMotion > 0 || ForceToEnableMotion > 0) + if (HasSpawnFlags(SF.MotionDisabled) || DamageToEnableMotion > 0 || ForceToEnableMotion > 0) physicsObject.EnableMotion(false); } @@ -477,7 +500,7 @@ public virtual bool CreateVPhysics() { if (HasInteraction(PropDataInteractions.PhysgunDamageNone)) PhysSetGameFlags(physicsObject, PhysicsFlags.NoImpactDamage); - if (HasSpawnFlags(SF_PHYSPROP_PREVENT_PICKUP)) + if (HasSpawnFlags(SF.PreventPickup)) PhysSetGameFlags(physicsObject, PhysicsFlags.NoPlayerPickup); return true; @@ -486,7 +509,7 @@ public virtual bool CreateVPhysics() { public override EntityCapabilities ObjectCaps() { EntityCapabilities caps = base.ObjectCaps() | EntityCapabilities.WorldcraftEditPosition; - if (HasSpawnFlags(SF_PHYSPROP_ENABLE_PICKUP_OUTPUT)) + if (HasSpawnFlags(SF.EnablePickupOutput)) caps |= EntityCapabilities.ImpulseUse; else if (BasePlayer.CanPickupObject(this, 35, 128)) { caps |= EntityCapabilities.ImpulseUse; @@ -496,7 +519,7 @@ public override EntityCapabilities ObjectCaps() { } } - if (HasSpawnFlags(SF_PHYSPROP_RADIUS_PICKUP)) { + if (HasSpawnFlags(SF.RadiusPickup)) { caps |= EntityCapabilities.UseInRadius; } diff --git a/Game.Server/Scripted.cs b/Game.Server/Scripted.cs index 53d50648..f55bac57 100644 --- a/Game.Server/Scripted.cs +++ b/Game.Server/Scripted.cs @@ -38,19 +38,23 @@ public class AI_ScriptedSequence : BaseEntity { public const int MAX_SCRIPT_EVENTS = 8; - public const int SF_SCRIPT_WAITTILLSEEN = 1; - public const int SF_SCRIPT_EXITAGITATED = 2; - public const int SF_SCRIPT_REPEATABLE = 4; - public const int SF_SCRIPT_LEAVECORPSE = 8; - public const int SF_SCRIPT_START_ON_SPAWN = 16; - public const int SF_SCRIPT_NOINTERRUPT = 32; - public const int SF_SCRIPT_OVERRIDESTATE = 64; - public const int SF_SCRIPT_DONT_TELEPORT_AT_END = 128; - public const int SF_SCRIPT_LOOP_IN_POST_IDLE = 256; - public const int SF_SCRIPT_HIGH_PRIORITY = 512; - public const int SF_SCRIPT_SEARCH_CYCLICALLY = 1024; - public const int SF_SCRIPT_NO_COMPLAINTS = 2048; - public const int SF_SCRIPT_ALLOW_DEATH = 4096; + [Flags] + public enum SF + { + WaitTillSeen = 1, + ExitAgitated = 2, + Repeatable = 4, + LeaveCorpse = 8, + StartOnSpawn = 16, + NoInterrupt = 32, + OverrideState = 64, + DontTeleportAtEnd = 128, + LoopInPostIdle = 256, + HighPriority = 512, + SearchCyclically = 1024, + NoComplaints = 2048, + AllowDeath = 4096, + } public static readonly ConVar ai_task_pre_script = new("ai_task_pre_script", "0", FCvar.None); @@ -250,7 +254,7 @@ static void ScriptEntityCancel(BaseEntity cine, bool pretendSuccess = false) { public override void Spawn() { SetSolid(SolidType.None); - if (string.IsNullOrEmpty(GetEntityName()) || HasSpawnFlags(SF_SCRIPT_START_ON_SPAWN)) { + if (string.IsNullOrEmpty(GetEntityName()) || HasSpawnFlags(SF.StartOnSpawn)) { StartThink(); SetNextThink(gpGlobals.CurTime + 1.0f); @@ -258,7 +262,7 @@ public override void Spawn() { WaitForBeginSequence = true; } - if (HasSpawnFlags(SF_SCRIPT_NOINTERRUPT)) + if (HasSpawnFlags(SF.NoInterrupt)) Interruptable = false; else Interruptable = true; @@ -290,7 +294,7 @@ void StopThink() { } public bool FCanOverrideState() { - if (HasSpawnFlags(SF_SCRIPT_OVERRIDESTATE)) + if (HasSpawnFlags(SF.OverrideState)) return true; return false; } @@ -419,7 +423,7 @@ public bool IsTimeToStart() { return npc; else if (canPlay == CanPlaySequence_t.CanPlayEnqueued) enqueueNPC = npc; - else if (!HasSpawnFlags(SF_SCRIPT_NO_COMPLAINTS)) + else if (!HasSpawnFlags(SF.NoComplaints)) DevMsg($"Found {Entity}, but can't play!\n"); } @@ -446,7 +450,7 @@ public bool IsTimeToStart() { bool FindEntity() { AI_BaseNPC? target = FindScriptEntity(); - if (HasSpawnFlags(SF_SCRIPT_SEARCH_CYCLICALLY)) + if (HasSpawnFlags(SF.SearchCyclically)) LastFoundEntity.Set(target); SetTarget(target); @@ -461,7 +465,7 @@ public void StartScript() { target = entity.MyNPCPointer(); if (target != null) { - target.RemoveSpawnFlags(SF_NPC_WAIT_FOR_SCRIPT); + target.RemoveSpawnFlags(AI_BaseNPC.SF.WaitForScript); AI_ScriptedSequence? targetCine = target.Cine.Get(); if (targetCine != null) { @@ -693,12 +697,12 @@ public void SynchNewSequence(ScriptStateType newState, string? sequence, bool sy } public void PostIdleDone(AI_BaseNPC npc) { - if (!string.IsNullOrEmpty(PostIdle) && HasSpawnFlags(SF_SCRIPT_LOOP_IN_POST_IDLE) && NextCine.Get() == null) { + if (!string.IsNullOrEmpty(PostIdle) && HasSpawnFlags(SF.LoopInPostIdle) && NextCine.Get() == null) { npc.ScriptState = ScriptStateType.PostIdle; StartSequence(npc, PostIdle, false); } else { - if (!HasSpawnFlags(SF_SCRIPT_REPEATABLE)) { + if (!HasSpawnFlags(SF.Repeatable)) { SetThink(SUB_Remove); SetNextThink(gpGlobals.CurTime + 0.1f); Thinking = false; @@ -712,7 +716,7 @@ public void PostIdleDone(AI_BaseNPC npc) { if (NextCine.Get() != null) { AI_ScriptedSequence nextCine = (AI_ScriptedSequence)NextCine.Get()!; - if (nextCine != this || HasSpawnFlags(SF_SCRIPT_REPEATABLE)) { + if (nextCine != this || HasSpawnFlags(SF.Repeatable)) { nextCine.SetTarget(npc); nextCine.StartScript(); } @@ -745,7 +749,7 @@ public void FixFlyFlag(AI_BaseNPC npc, EntityFlags savedCineFlags) { } public void AllowInterrupt(bool allow) { - if (HasSpawnFlags(SF_SCRIPT_NOINTERRUPT)) + if (HasSpawnFlags(SF.NoInterrupt)) return; Interruptable = allow; } @@ -789,7 +793,7 @@ public bool CanEnqueueAfter() { return false; } - if (!NextCine.Get()!.HasSpawnFlags(SF_SCRIPT_HIGH_PRIORITY)) + if (!NextCine.Get()!.HasSpawnFlags(SF.HighPriority)) return true; DevMsg(2, $"{NextCine.Get()!.GetDebugName()} is a priority script and cannot be kicked out of the queue\n"); @@ -826,7 +830,7 @@ public void ModifyScriptedAutoMovement(ref Vector3 newPos) { public void CancelScript() { DevMsg(2, $"Cancelling script: {Play}\n"); - bool dontCancelOther = (DontCancelOtherSequences || HasSpawnFlags(SF_SCRIPT_ALLOW_DEATH)) && StartTime != 0; + bool dontCancelOther = (DontCancelOtherSequences || HasSpawnFlags(SF.AllowDeath)) && StartTime != 0; if (dontCancelOther || string.IsNullOrEmpty(GetEntityName())) { ScriptEntityCancel(this); return; @@ -883,7 +887,7 @@ public override void Activate() { public static string? GetSpawnPreIdleSequenceForScript(BaseEntity entity) { AI_ScriptedSequence? script = gEntList.NextEntByClass(null); while (script != null) { - if (script.HasSpawnFlags(SF_SCRIPT_START_ON_SPAWN) && script.Entity == entity.GetEntityName()) { + if (script.HasSpawnFlags(SF.StartOnSpawn) && script.Entity == entity.GetEntityName()) { if (script.PreIdle != null) return script.PreIdle; return null; diff --git a/Game.Server/Sound.cs b/Game.Server/Sound.cs index 9bda322a..0bb2326e 100644 --- a/Game.Server/Sound.cs +++ b/Game.Server/Sound.cs @@ -304,9 +304,13 @@ public static void UTIL_RestartAmbientSounds() { [LinkEntityToClass("ambient_generic")] public class AmbientGeneric : PointEntity { - public const int SF_AMBIENT_SOUND_EVERYWHERE = 1; - public const int SF_AMBIENT_SOUND_START_SILENT = 16; - public const int SF_AMBIENT_SOUND_NOT_LOOPING = 32; + [Flags] + public enum SF + { + Everywhere = 1, + StartSilent = 16, + NotLooping = 32, + } public float Radius; public float MaxRadius; @@ -364,7 +368,7 @@ public AmbientGeneric() { // Spawn //----------------------------------------------------------------------------- public override void Spawn() { - SoundLevel = ComputeSoundlevel(Radius, (SpawnFlags & SF_AMBIENT_SOUND_EVERYWHERE) != 0); + SoundLevel = ComputeSoundlevel(Radius, HasSpawnFlags(SF.Everywhere)); ComputeMaxAudibleDistance(); ValidateSoundFile(); @@ -387,7 +391,7 @@ public override void Spawn() { Active = false; - if ((SpawnFlags & SF_AMBIENT_SOUND_NOT_LOOPING) != 0) + if (HasSpawnFlags(SF.NotLooping)) Looping = false; else Looping = true; @@ -552,7 +556,7 @@ public override void Precache() { PrecacheScriptSound(SoundFile); } - if ((SpawnFlags & SF_AMBIENT_SOUND_START_SILENT) == 0) { + if (!HasSpawnFlags(SF.StartSilent)) { // start the sound ASAP if (Looping) Active = true; @@ -580,7 +584,7 @@ public override void Activate() { SoundSourceEntIndex = EntIndex(); } else { - if ((SpawnFlags & SF_AMBIENT_SOUND_EVERYWHERE) == 0) + if (!HasSpawnFlags(SF.Everywhere)) AddEFlags(EFL.ForceCheckTransmit); } } @@ -619,7 +623,7 @@ public override void SetTransmit(CheckTransmitInfo info, bool always) { return; // Don't bother sending the position of the source if we have to play everywhere - if ((SpawnFlags & SF_AMBIENT_SOUND_EVERYWHERE) != 0) + if (HasSpawnFlags(SF.Everywhere)) return; Assert(info.ClientEnt != null); @@ -1004,7 +1008,7 @@ void ToggleSound() { Active = false; // HACKHACK - this makes the code in Precache() work properly after a save/restore - SpawnFlags |= SF_AMBIENT_SOUND_START_SILENT; + AddSpawnFlags(SF.StartSilent); if (Dpv.SpinDownSav != 0 || Dpv.FadeOutSav != 0) { // spin it down (or fade it) before shutoff if spindown is set diff --git a/Game.Server/TriggerPlayerMovement.cs b/Game.Server/TriggerPlayerMovement.cs index 408e77b2..4689872e 100644 --- a/Game.Server/TriggerPlayerMovement.cs +++ b/Game.Server/TriggerPlayerMovement.cs @@ -12,18 +12,22 @@ public class TriggerPlayerMovement : BaseTrigger public static readonly SendTable DT_TriggerPlayerMovement = new(DT_BaseTrigger, []); public static readonly new ServerClass ServerClass = new ServerClass(DT_TriggerPlayerMovement); - const int SF_TRIGGER_MOVE_AUTODISABLE = 0x80; // disable auto movement - const int SF_TRIGGER_AUTO_DUCK = 0x800; // Duck automatically + [Flags] + public enum SF + { + MoveAutoDisable = 0x80, // disable auto movement + AutoDuck = 0x800, // Duck automatically + } //----------------------------------------------------------------------------- // Purpose: Called when spawning, after keyvalues have been handled. //----------------------------------------------------------------------------- public override void Spawn() { - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_PLAYER_ALLY_NPCS)) { + if (HasSpawnFlags(BaseTrigger.SF.OnlyPlayerAllyNPCs)) { // @Note (toml 01-07-04): fix up spawn flag collision coding error. Remove at some point once all maps fixed up please! DevMsg("*** trigger_playermovement using obsolete spawnflag. Remove and reset with new value for \"Disable auto player movement\"\n"); - RemoveSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_PLAYER_ALLY_NPCS); - AddSpawnFlags(SF_TRIGGER_MOVE_AUTODISABLE); + RemoveSpawnFlags(BaseTrigger.SF.OnlyPlayerAllyNPCs); + AddSpawnFlags(SF.MoveAutoDisable); } base.Spawn(); @@ -41,11 +45,11 @@ public override void StartTouch(BaseEntity? other) { if (player == null) return; - if (HasSpawnFlags(SF_TRIGGER_AUTO_DUCK)) + if (HasSpawnFlags(SF.AutoDuck)) player.ForceButtons(InButtons.Duck); // UNDONE: Currently this is the only operation this trigger can do - if (HasSpawnFlags(SF_TRIGGER_MOVE_AUTODISABLE)) + if (HasSpawnFlags(SF.MoveAutoDisable)) player.Local.AllowAutoMovement = false; } @@ -58,10 +62,10 @@ public override void EndTouch(BaseEntity? other) { if (player == null) return; - if (HasSpawnFlags(SF_TRIGGER_AUTO_DUCK)) + if (HasSpawnFlags(SF.AutoDuck)) player.UnforceButtons(InButtons.Duck); - if (HasSpawnFlags(SF_TRIGGER_MOVE_AUTODISABLE)) + if (HasSpawnFlags(SF.MoveAutoDisable)) player.Local.AllowAutoMovement = true; } } diff --git a/Game.Server/Triggers.cs b/Game.Server/Triggers.cs index 11c0660c..f0203a8b 100644 --- a/Game.Server/Triggers.cs +++ b/Game.Server/Triggers.cs @@ -16,20 +16,6 @@ namespace Game.Server; public static class TriggerGlobals { - public const int SF_TRIGGER_ALLOW_CLIENTS = 0x01; // Players can fire this trigger - public const int SF_TRIGGER_ALLOW_NPCS = 0x02; // NPCS can fire this trigger - public const int SF_TRIGGER_ALLOW_PUSHABLES = 0x04; // Pushables can fire this trigger - public const int SF_TRIGGER_ALLOW_PHYSICS = 0x08; // Physics objects can fire this trigger - public const int SF_TRIGGER_ONLY_PLAYER_ALLY_NPCS = 0x10; // *if* NPCs can fire this trigger, this flag means only player allies do so - public const int SF_TRIGGER_ONLY_CLIENTS_IN_VEHICLES = 0x20; // *if* Players can fire this trigger, this flag means only players inside vehicles can - public const int SF_TRIGGER_ALLOW_ALL = 0x40; // Everything can fire this trigger EXCEPT DEBRIS! - public const int SF_TRIGGER_ONLY_CLIENTS_OUT_OF_VEHICLES = 0x200; // *if* Players can fire this trigger, this flag means only players outside vehicles can - public const int SF_TRIG_PUSH_ONCE = 0x80; // trigger_push removes itself after firing once - public const int SF_TRIG_PUSH_AFFECT_PLAYER_ON_LADDER = 0x100; // if pushed object is player on a ladder, then this disengages them from the ladder (HL2only) - public const int SF_TRIG_TOUCH_DEBRIS = 0x400; // Will touch physics debris objects - public const int SF_TRIGGER_ONLY_NPCS_IN_VEHICLES = 0X800; // *if* NPCs can fire this trigger, only NPCs in vehicles do so (respects player ally flag too) - public const int SF_TRIGGER_DISALLOW_BOTS = 0x1000; // Bots are not allowed to fire this trigger - public static readonly ConVar showtriggers = new("showtriggers", "0", FCvar.Cheat, "Shows trigger brushes"); // Global list of triggers that care about weapon fire @@ -90,6 +76,24 @@ public static bool IsTakingTriggerHurtDamageAtPoint(in Vector3 vecPoint) { [NetworkName("CBaseTrigger")] public class BaseTrigger : BaseToggle { + [Flags] + public enum SF + { + AllowClients = 0x01, // Players can fire this trigger + AllowNPCs = 0x02, // NPCS can fire this trigger + AllowPushables = 0x04, // Pushables can fire this trigger + AllowPhysics = 0x08, // Physics objects can fire this trigger + OnlyPlayerAllyNPCs = 0x10, // *if* NPCs can fire this trigger, this flag means only player allies do so + OnlyClientsInVehicles = 0x20, // *if* Players can fire this trigger, this flag means only players inside vehicles can + AllowAll = 0x40, // Everything can fire this trigger EXCEPT DEBRIS! + OnlyClientsOutOfVehicles = 0x200, // *if* Players can fire this trigger, this flag means only players outside vehicles can + PushOnce = 0x80, // trigger_push removes itself after firing once + PushAffectPlayerOnLadder = 0x100, // if pushed object is player on a ladder, then this disengages them from the ladder (HL2only) + TouchDebris = 0x400, // Will touch physics debris objects + OnlyNPCsInVehicles = 0X800, // *if* NPCs can fire this trigger, only NPCs in vehicles do so (respects player ally flag too) + DisallowBots = 0x1000, // Bots are not allowed to fire this trigger + } + public static readonly SendTable DT_BaseTrigger = new(DT_BaseToggle, [ SendPropBool(FIELD_BT.OF(nameof(ClientSidePredicted))), SendPropInt(FIELD_BT.OF(nameof(SpawnFlags)), 32, PropFlags.NoScale) @@ -182,16 +186,16 @@ public virtual void InputTouchTest(InputData inputdata) { //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ public override void Spawn() { - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_PLAYER_ALLY_NPCS) || HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_NPCS_IN_VEHICLES)) { + if (HasSpawnFlags(SF.OnlyPlayerAllyNPCs) || HasSpawnFlags(SF.OnlyNPCsInVehicles)) { // Automatically set this trigger to work with NPC's. - AddSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_NPCS); + AddSpawnFlags(SF.AllowNPCs); } - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_CLIENTS_IN_VEHICLES)) - AddSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_CLIENTS); + if (HasSpawnFlags(SF.OnlyClientsInVehicles)) + AddSpawnFlags(SF.AllowClients); - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_CLIENTS_OUT_OF_VEHICLES)) - AddSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_CLIENTS); + if (HasSpawnFlags(SF.OnlyClientsOutOfVehicles)) + AddSpawnFlags(SF.AllowClients); base.Spawn(); } @@ -313,7 +317,7 @@ public void InitTrigger() { TouchingEntities.Clear(); - if (HasSpawnFlags(TriggerGlobals.SF_TRIG_TOUCH_DEBRIS)) + if (HasSpawnFlags(SF.TouchDebris)) CollisionProp().AddSolidFlags(SolidFlags.TriggerTouchDebris); } @@ -323,14 +327,14 @@ public void InitTrigger() { //----------------------------------------------------------------------------- public virtual bool PassesTriggerFilters(BaseEntity other) { // First test spawn flag filters - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_ALL) || - (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_CLIENTS) && (other.GetFlags() & EntityFlags.Client) != 0) || - (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_NPCS) && (other.GetFlags() & EntityFlags.NPC) != 0) || - (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_PUSHABLES) && FClassnameIs(other, "func_pushable")) || - (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ALLOW_PHYSICS) && other.GetMoveType() == Source.MoveType.VPhysics) + if (HasSpawnFlags(SF.AllowAll) || + (HasSpawnFlags(SF.AllowClients) && (other.GetFlags() & EntityFlags.Client) != 0) || + (HasSpawnFlags(SF.AllowNPCs) && (other.GetFlags() & EntityFlags.NPC) != 0) || + (HasSpawnFlags(SF.AllowPushables) && FClassnameIs(other, "func_pushable")) || + (HasSpawnFlags(SF.AllowPhysics) && other.GetMoveType() == Source.MoveType.VPhysics) #if HL2_EPISODIC || TF_DLL || - (HasSpawnFlags(TriggerGlobals.SF_TRIG_TOUCH_DEBRIS) && + (HasSpawnFlags(SF.TouchDebris) && (other.GetCollisionGroup() == Source.CollisionGroup.Debris || other.GetCollisionGroup() == Source.CollisionGroup.DebrisTrigger || other.GetCollisionGroup() == Source.CollisionGroup.InteractiveDebris) @@ -344,7 +348,7 @@ public virtual bool PassesTriggerFilters(BaseEntity other) { if (!player.IsAlive()) return false; - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_CLIENTS_IN_VEHICLES)) { + if (HasSpawnFlags(SF.OnlyClientsInVehicles)) { if (!player.IsInAVehicle()) return false; @@ -357,12 +361,12 @@ public virtual bool PassesTriggerFilters(BaseEntity other) { return false; } - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_ONLY_CLIENTS_OUT_OF_VEHICLES)) { + if (HasSpawnFlags(SF.OnlyClientsOutOfVehicles)) { if (player.IsInAVehicle()) return false; } - if (HasSpawnFlags(TriggerGlobals.SF_TRIGGER_DISALLOW_BOTS)) { + if (HasSpawnFlags(SF.DisallowBots)) { if (player.IsFakeClient()) return false; } @@ -876,8 +880,12 @@ public override void Spawn() { [LinkEntityToClass("trigger_look")] public class TriggerLook : TriggerOnce { - const int SF_TRIGGERLOOK_FIREONCE = 128; - const int SF_TRIGGERLOOK_USEVELOCITY = 256; + [Flags] + public enum SF + { + FireOnce = 128, + UseVelocity = 256, + } public EHANDLE LookTarget = new(); public float FieldOfView; @@ -980,7 +988,7 @@ public override void Touch(BaseEntity? other) { // Check that toucher is facing the target // ---------------------------------------- Vector3 vLookDir; - if (HasSpawnFlags(SF_TRIGGERLOOK_USEVELOCITY)) { + if (HasSpawnFlags(SF.UseVelocity)) { vLookDir = other.GetAbsVelocity(); if (vLookDir == vec3_origin) { // See if they're in a vehicle @@ -1037,7 +1045,7 @@ void Trigger(BaseEntity? activator, bool timeout) { SetNextThink(TICK_NEVER_THINK); } - if (HasSpawnFlags(SF_TRIGGERLOOK_FIREONCE)) { + if (HasSpawnFlags(SF.FireOnce)) { SetThink(SUB_Remove); SetNextThink(gpGlobals.CurTime); } @@ -1116,7 +1124,7 @@ public override void Touch(BaseEntity? other) { MathLib.VectorRotate(PushDir, EntityToWorldTransform(), out Vector3 vecAbsDir); // Instant trigger, just transfer velocity and remove - if (HasSpawnFlags(TriggerGlobals.SF_TRIG_PUSH_ONCE)) { + if (HasSpawnFlags(SF.PushOnce)) { other.ApplyAbsVelocityImpulse(PushSpeed * vecAbsDir); if (vecAbsDir.Z > 0) @@ -1146,7 +1154,7 @@ public override void Touch(BaseEntity? other) { // HACK HACK HL2 players on ladders will only be disengaged if the sf is set, otherwise no push occurs. if (other.IsPlayer() && other.GetMoveType() == Source.MoveType.Ladder) { - if (!HasSpawnFlags(TriggerGlobals.SF_TRIG_PUSH_AFFECT_PLAYER_ON_LADDER)) { + if (!HasSpawnFlags(SF.PushAffectPlayerOnLadder)) { // Ignore the push return; } @@ -1187,7 +1195,11 @@ public override void Touch(BaseEntity? other) { [LinkEntityToClass("trigger_teleport")] public class TriggerTeleport : BaseTrigger { - const int SF_TELEPORT_PRESERVE_ANGLES = 0x20; // Preserve angles even when a local landmark is not specified + [Flags] + public enum SF + { + PreserveAngles = 0x20, // Preserve angles even when a local landmark is not specified + } public string? Landmark; @@ -1249,7 +1261,7 @@ public override void Touch(BaseEntity? other) { QAngle? angles = null; Vector3? velocity = null; - if (entLandmark == null && !HasSpawnFlags(SF_TELEPORT_PRESERVE_ANGLES)) { + if (entLandmark == null && !HasSpawnFlags(SF.PreserveAngles)) { angles = entTarget.GetAbsAngles(); #if HL1_DLL diff --git a/Game.Shared/BaseCombatWeaponShared.cs b/Game.Shared/BaseCombatWeaponShared.cs index 574f19ab..9001f998 100644 --- a/Game.Shared/BaseCombatWeaponShared.cs +++ b/Game.Shared/BaseCombatWeaponShared.cs @@ -1269,9 +1269,13 @@ public void SetOwner(BaseCombatCharacter? owner) { - public const int SF_WEAPON_START_CONSTRAINED = 1 << 0; - public const int SF_WEAPON_NO_PLAYER_PICKUP = 1 << 1; - public const int SF_WEAPON_NO_PHYSCANNON_PUNT = 1 << 2; + [Flags] + public enum SF + { + StartConstrained = 1 << 0, + NoPlayerPickup = 1 << 1, + NoPhyscannonPunt = 1 << 2, + } public virtual void OnPickedUp(BaseCombatCharacter newOwner) { #if !CLIENT_DLL @@ -1312,7 +1316,7 @@ public void DefaultTouch(BaseEntity? other) { if (Util.ItemCanBeTouchedByPlayer(this, player)) OnCacheInteraction.FireOutput(other, this); - if (HasSpawnFlags(SF_WEAPON_NO_PLAYER_PICKUP)) + if (HasSpawnFlags(SF.NoPlayerPickup)) return; if (player.BumpWeapon(this)) @@ -1325,7 +1329,7 @@ public void SetPickupTouch() { SetTouch(DefaultTouch); if (gpGlobals.MaxClients > 1) { - if (HasSpawnFlags(BasePlayer.SF_NORESPAWN)) { + if (HasSpawnFlags(BasePlayer.SF.NoRespawn)) { SetThink(SUB_Remove); SetNextThink(gpGlobals.CurTime + 30.0f); } diff --git a/Game.Shared/MultiplayRules.cs b/Game.Shared/MultiplayRules.cs index cd407b80..00aab1ef 100644 --- a/Game.Shared/MultiplayRules.cs +++ b/Game.Shared/MultiplayRules.cs @@ -305,7 +305,7 @@ public override Vector3 VecWeaponRespawnSpot(BaseCombatWeapon weapon) { return weapon.GetAbsOrigin(); } public override GameRulesRespawnReturnCode WeaponShouldRespawn(BaseCombatWeapon weapon) { - return weapon.HasSpawnFlags(BasePlayer.SF_NORESPAWN) ? GameRulesRespawnReturnCode.WeaponRespawnNo : GameRulesRespawnReturnCode.WeaponRespawnYes; + return weapon.HasSpawnFlags(BasePlayer.SF.NoRespawn) ? GameRulesRespawnReturnCode.WeaponRespawnNo : GameRulesRespawnReturnCode.WeaponRespawnYes; } public override bool CanHavePlayerItem(BasePlayer player, BaseCombatWeapon item) { if (weaponstay.GetInt() > 0) { @@ -327,7 +327,7 @@ public override void PlayerGotItem(BasePlayer player, Item item) { } public override GameRulesRespawnReturnCode ItemShouldRespawn(Item item) { - return item.HasSpawnFlags(BasePlayer.SF_NORESPAWN) ? GameRulesRespawnReturnCode.ItemRespawnNo : GameRulesRespawnReturnCode.ItemRespawnYes; + return item.HasSpawnFlags(BasePlayer.SF.NoRespawn) ? GameRulesRespawnReturnCode.ItemRespawnNo : GameRulesRespawnReturnCode.ItemRespawnYes; } public override TimeUnit_t FlItemRespawnTime(Item item) { return gpGlobals.CurTime + ITEM_RESPAWN_TIME; diff --git a/Game.Shared/PropsShared.cs b/Game.Shared/PropsShared.cs index 5a0fb5ff..d7142684 100644 --- a/Game.Shared/PropsShared.cs +++ b/Game.Shared/PropsShared.cs @@ -1,5 +1,3 @@ -global using static Game.Shared.PropsSharedGlobals; - using CommunityToolkit.HighPerformance; using Source.Common.Formats.Keyvalues; @@ -9,29 +7,6 @@ namespace Game.Shared; -public static class PropsSharedGlobals -{ - - public const int SF_PHYSPROP_START_ASLEEP = 0x000001; - public const int SF_PHYSPROP_DONT_TAKE_PHYSICS_DAMAGE = 0x000002;// this prop can't be damaged by physics collisions - public const int SF_PHYSPROP_DEBRIS = 0x000004; - public const int SF_PHYSPROP_MOTIONDISABLED = 0x000008;// motion disabled at startup (flag only valid in spawn - motion can be enabled via input) - public const int SF_PHYSPROP_TOUCH = 0x000010;// can be 'crashed through' by running player (plate glass) - public const int SF_PHYSPROP_PRESSURE = 0x000020;// can be broken by a player standing on it - public const int SF_PHYSPROP_ENABLE_ON_PHYSCANNON = 0x000040;// enable motion only if the player grabs it with the physcannon - public const int SF_PHYSPROP_NO_ROTORWASH_PUSH = 0x000080;// The rotorwash doesn't push these - public const int SF_PHYSPROP_ENABLE_PICKUP_OUTPUT = 0x000100;// If set, allow the player to +USE this for the purposes of generating an output - public const int SF_PHYSPROP_PREVENT_PICKUP = 0x000200;// If set, prevent +USE/Physcannon pickup of this prop - public const int SF_PHYSPROP_PREVENT_PLAYER_TOUCH_ENABLE = 0x000400;// If set, the player will not cause the object to enable its motion when bumped into - public const int SF_PHYSPROP_HAS_ATTACHED_RAGDOLLS = 0x000800;// Need to remove attached ragdolls on enable motion/etc - public const int SF_PHYSPROP_FORCE_TOUCH_TRIGGERS = 0x001000;// Override normal debris behavior and respond to triggers anyway - public const int SF_PHYSPROP_FORCE_SERVER_SIDE = 0x002000;// Force multiplayer physics object to be serverside - public const int SF_PHYSPROP_RADIUS_PICKUP = 0x004000;// For Xbox, makes small objects easier to pick up by allowing them to be found - public const int SF_PHYSPROP_ALWAYS_PICK_UP = 0x100000;// Physcannon can always pick this up, no matter what mass or constraints may apply. - public const int SF_PHYSPROP_NO_COLLISIONS = 0x200000;// Don't enable collisions on spawn - public const int SF_PHYSPROP_IS_GIB = 0x400000;// Limit # of active gibs -} - public enum ParsePropDataReturn { Succeeded, @@ -316,7 +291,7 @@ public ParsePropDataReturn ParsePropFromKV(BaseEntity prop, KeyValues section, K #if GAME_DLL // If we now have health, we're not allowed to ignore physics damage if (prop.GetHealth() != 0) - prop.RemoveSpawnFlags(SF_PHYSPROP_DONT_TAKE_PHYSICS_DAMAGE); + prop.RemoveSpawnFlags(Game.Server.BreakableProp.SF.DontTakePhysicsDamage); #endif }