Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Game.Client/BaseViewport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class BaseViewport : EditablePanel, IViewPort
readonly Hud HUD = Singleton<Hud>();
readonly IEngineVGui EngineVGui = Singleton<IEngineVGui>();
bool Initialized;
bool HasParent;
new bool HasParent;
InlineArray2<int> OldSize;

public override void OnScreenSizeChanged(int oldWide, int oldTall) {
Expand Down
6 changes: 3 additions & 3 deletions Game.Client/C_BaseAnimating.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1640,8 +1640,8 @@ public void InvalidateMdlCache() {
public bool IsModelScaled() => ModelScale > 1.0f + FLT_EPSILON || ModelScale < 1.0f - FLT_EPSILON;
public float GetModelScale() => ModelScale;

public int GetBody() => Body;
public int GetSkin() => Skin;
public override int GetBody() => Body;
public override int GetSkin() => Skin;

public int InternalDrawModel(StudioFlags flags) {
var model = GetModel();
Expand Down Expand Up @@ -1768,7 +1768,7 @@ public int LookupBone(ReadOnlySpan<char> name) {
return BoneSetup.Studio_BoneIndexByName(GetModelPtr(), name);
}

public int LookupAttachment(ReadOnlySpan<char> attachmentName) {
public override int LookupAttachment(ReadOnlySpan<char> attachmentName) {
StudioHdr? hdr = GetModelPtr();
if (hdr == null)
return -1;
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/C_BaseEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ public ReadOnlySpan<char> GetSubMaterialOverride(int index) {



public int GetTeamNumber() => TeamNum;
public virtual int GetTeamNumber() => TeamNum;

public ref readonly Vector3 WorldAlignMins() {
Assert(!CollisionProp().IsBoundsDefinedInEntitySpace());
Expand Down
2 changes: 0 additions & 2 deletions Game.Client/C_FuncSmokeVolume.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Game.Shared;

using Game.Shared;

using Source;
using Source.Common;

Expand Down
2 changes: 1 addition & 1 deletion Game.Client/C_ParticleSmokeGrenade.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public partial class C_ParticleSmokeGrenade : C_BaseParticleEntity
];

[NetworkVar("m_flSpawnTime")]
public float SpawnTime;
public new float SpawnTime;
[NetworkVar("m_FadeStartTime")]
public float FadeStartTime;
[NetworkVar("m_FadeEndTime")]
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/C_TEBeamFollow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class C_TEBeamFollow : C_BaseBeam
];

[NetworkVar("m_iEntIndex")]
public int EntIndex;
public new int EntIndex;
}

public static partial class TempEnts
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/C_Team.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static void Recv(ref readonly RecvProxyData data, object instance, IField
public void RemoveAllPlayers() => Players.Clear();
public override void PreDataUpdate(DataUpdateType updateType) => base.PreDataUpdate(updateType);
public C_BasePlayer? GetPlayer(int idx) => (C_BasePlayer?)cl_entitylist.GetEnt(Players[idx]);
public int GetTeamNumber() => TeamNum;
public override int GetTeamNumber() => TeamNum;
public ReadOnlySpan<char> Get_Name() => ((Span<char>)Teamname).SliceNullTerminatedString();
public int Get_Score() => Score;
public int Get_Deaths() => Deaths;
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/ClientEntityList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void RemoveListenerEntity(IClientEntityListener listener) {

}

public BaseHandle InvalidHandle() => new(Constants.INVALID_EHANDLE_INDEX);
public new BaseHandle InvalidHandle() => new(Constants.INVALID_EHANDLE_INDEX);

public IClientThinkable? GetClientThinkableFromHandle(in BaseHandle hEnt) {
IClientUnknown? pEnt = GetClientUnknownFromHandle(hEnt);
Expand Down
4 changes: 2 additions & 2 deletions Game.Client/ClientModeShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,9 @@ static void MsgFunc_VGUIMenu(bf_read msg) {

if (count > 0) {
KeyValues keys = new("data");
Span<char> name = stackalloc char[256];
Span<char> data = stackalloc char[255];
for (int i = 0; i < count; i++) {
Span<char> name = stackalloc char[256];
Span<char> data = stackalloc char[255];
msg.ReadString(name);
msg.ReadString(data);
keys.SetString(name, data);
Expand Down
2 changes: 0 additions & 2 deletions Game.Client/GarrysMod/C_GMOD_Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
nameof(Hands),
nameof(WaterLevel),
nameof(MaxArmor),
nameof(Gravity),

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-15-intel, Debug (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, Debug)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Release)

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no

Check failure on line 47 in Game.Client/GarrysMod/C_GMOD_Player.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest, Release (Dedicated))

'Gravity' is referenced by a network table but has no
nameof(SprintEnabled),
];

Expand Down Expand Up @@ -95,8 +95,6 @@
public EHANDLE Hands = new();
[NetworkVar("m_iMaxArmor")]
public int MaxArmor;
[NetworkVar("m_flGravity")]
public float Gravity;
[NetworkVar("m_bSprintEnabled")]
public bool SprintEnabled;

Expand Down
2 changes: 1 addition & 1 deletion Game.Client/HL2/HudBattery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void VidInit() {
Reset();
}

public void Reset() {
public override void Reset() {
ReadOnlySpan<char> tempString = Localize.Find("#Valve_Hud_SUIT");

if (!tempString.IsEmpty)
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/HL2/HudHealth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void Init() {
public void VidInit() {
Reset();
}
public void Reset() {
public override void Reset() {
Health = -1;
#if !GMOD_DLL
BitsDamage = 0;
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/HL2/HudSuitPower.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public HudSuitPower(string? panelName) : base("HudSuitPower", panelName) {
((IHudElement)this).SetHiddenBits(HideHudBits.Health | HideHudBits.NeedSuit | HideHudBits.PlayerDead);
}

public void Init() {
public override void Init() {
SuitPower = SUIT_POWER_INIT;
SuitPowerLow = -1;
ActiveSuitDevices = 0;
Expand Down
2 changes: 1 addition & 1 deletion Game.Client/HUD/BaseHudChat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override void ApplySchemeSettings(IScheme scheme) {
SetFont(Font);
}

internal IFont? GetFont() {
internal new IFont? GetFont() {
return Font;
}

Expand Down
3 changes: 2 additions & 1 deletion Game.Client/HistoryResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ public override void Paint() {

GetSize(out int wide, out int tall);

Span<char> text = stackalloc char[16];
for (int i = 0; i < PickupHistory.Count; i++) {
var item = PickupHistory[i];
if (item.Type != null) {
Expand Down Expand Up @@ -308,7 +309,7 @@ public override void Paint() {
itemAmmoIcon?.DrawSelf((int)(xpos - (itemAmmoIcon.Width() * 1.25f)), ypos, clr);

if (amount != 0) {
Span<char> text = stackalloc char[16];
text.Clear();
sprintf(text, "%i").I(amount);

ypos -= (Surface.GetFontTall(NumberFont) - itemIcon.Height()) / 2;
Expand Down
3 changes: 2 additions & 1 deletion Game.Client/Prediction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ public void PostNetworkDataReceived(int commandsAcknowledged) {
// Transfer intermediate data from other predictables
int c = predictables.GetPredictableCount();
int i;
Span<char> szBuf = stackalloc char[32];
for (i = 0; i < c; i++) {
C_BaseEntity? ent = predictables.GetPredictable(i);
if (ent == null)
Expand All @@ -238,7 +239,7 @@ public void PostNetworkDataReceived(int commandsAcknowledged) {
PreviousAckHadErrors = true;

if (showlist != 0) {
Span<char> sz = stackalloc char[32];
Span<char> sz = szBuf;
if (ent.EntIndex() == -1)
sz = sprintf(sz, "handle %u").U((uint)ent.GetClientHandle().Index);
else
Expand Down
5 changes: 3 additions & 2 deletions Game.Client/Ragdoll.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,10 @@ public static ClientRagdoll CreateRagdoll(
ClientRagdoll ragdoll = new();
ragdoll.Init(ent, studiohdr, forceVector, forceBone, deltaBones0, deltaBones1, currentBonePosition, dt, fixedConstraints);

if (!ragdoll.IsValid())
if (!ragdoll.IsValid()) {
Msg($"Bad ragdoll for {studiohdr.Name()}");
return null;
return null;
}

return ragdoll;
}
Expand Down
12 changes: 6 additions & 6 deletions Game.Client/View.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ public ViewRender(IMaterialSystem materials, IServiceProvider services, Render e

internal IRenderView render;

public void DisableVis() {
throw new NotImplementedException();
}
public void DisableVis() => ForceNoVis = true;

public void DriftPitch() {
throw new NotImplementedException();
Expand Down Expand Up @@ -184,6 +182,9 @@ public float GetZNear() {
public void Init() {
render = services.GetRequiredService<IRenderView>();

DrawEntities = cvar.FindVar("r_drawentities");
DrawBrushModels = cvar.FindVar("r_drawbrushmodels");

TranslucentSingleColor.Init("debug/debugtranslucentsinglecolor", MaterialDefines.TEXTURE_GROUP_OTHER);
ModulateSingleColor.Init("engine/modulatesinglecolor", MaterialDefines.TEXTURE_GROUP_OTHER);
}
Expand Down Expand Up @@ -984,9 +985,7 @@ public void SetScreenOverlayMaterial(IMaterial? pMaterial) {
throw new NotImplementedException();
}

public bool ShouldDrawBrushModels() {
throw new NotImplementedException();
}
public bool ShouldDrawBrushModels() => DrawBrushModels == null || DrawBrushModels.GetInt() != 0;

public void Shutdown() {
throw new NotImplementedException();
Expand Down Expand Up @@ -1019,6 +1018,7 @@ public void WriteSaveGameScreenshotOfSize(ReadOnlySpan<char> pFilename, int widt
}

ConVar? DrawEntities;
ConVar? DrawBrushModels;

internal bool ShouldDrawEntities() {
return DrawEntities == null || DrawEntities.GetInt() != 0;
Expand Down
2 changes: 1 addition & 1 deletion Game.Server/AI_GoalPolice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void FireWarningLevelOutput(int level) {
public void InputDisableKnockOut(InputData data) => OverrideKnockOut = false;

public float Radius;
public EHANDLE Target = new();
public new EHANDLE Target = new();
public string? TargetName;
public bool OverrideKnockOut;

Expand Down
2 changes: 1 addition & 1 deletion Game.Server/AI_Hint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ public float Yaw() {
return GetLocalAngles().Y;
}

bool IsViewable() {
public override bool IsViewable() {
if (NodeData.Disabled != 0)
return false;

Expand Down
7 changes: 2 additions & 5 deletions Game.Server/BaseAnimating.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ public Activity GetSequenceActivity(int sequence) {
public float GetModelScale() => ModelScale;

protected StudioHdr? StudioHdr;
public Model? GetModel() => modelinfo.GetModel(GetModelIndex());

// todo...
public StudioHdr? GetModelPtr() {
Expand Down Expand Up @@ -555,11 +554,9 @@ public BoneCache GetBoneCache() {
pcache.UpdateBones(bonetoworld, studioHdr.NumBones(), gpGlobals.CurTime);
}
else {
BoneCacheParams parms = new();
scoped BoneCacheParams parms = new();
parms.StudioHdr = studioHdr;
unsafe {
parms.BoneToWorld = bonetoworld;
}
parms.BoneToWorld = bonetoworld;
parms.CurTime = gpGlobals.CurTime;
parms.BoneMask = boneMask;

Expand Down
7 changes: 4 additions & 3 deletions Game.Server/BaseEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ public bool IsStandable() {

public virtual bool CanBeSeenBy(AI_BaseNPC npc) => true;

public bool IsViewable() {
public virtual bool IsViewable() {
if (IsEffectActive(EntityEffects.NoDraw))
return false;

Expand Down Expand Up @@ -1019,7 +1019,6 @@ public string GetDebugName() {
}

EHANDLE Parent;
public float Gravity;
public void SetPredictionEligible(bool canpredict) { } // nothing in game code
public ref readonly Vector3 GetLocalOrigin() => ref __nv_Origin;
public ref readonly QAngle GetLocalAngles() => ref __nv_Rotation;
Expand Down Expand Up @@ -1427,7 +1426,7 @@ public static void EmitSound<IRF>(scoped in IRF filter, int entIndex, scoped in

public Team? GetTeam() => GetGlobalTeam(TeamNum);

public int GetTeamNumber() => TeamNum;
public virtual int GetTeamNumber() => TeamNum;

IPhysicsObject? PhysicsObject = null!;
public virtual void VPhysicsUpdate(IPhysicsObject physics) {
Expand Down Expand Up @@ -2020,6 +2019,8 @@ public ReadOnlySpan<char> GetSubMaterialOverride(int index) {
public partial Vector3 ViewOffset { get; set; }
[NetworkVar("m_flFriction")]
public partial float Friction { get; set; }
[NetworkVar("m_flGravity")]
public partial float Gravity { get; set; }

public byte OldRenderMode;
public Vector3 AbsOrigin;
Expand Down
7 changes: 1 addition & 6 deletions Game.Server/EntityList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,7 @@ public void AddToDeleteList(IServerNetworkable? ent) {
if (list != null)
list = NextEntInfo(list);

while (list != null) {
return (BaseEntity?)list.Entity;
list = NextEntInfo(list); //??
}

return null;
return list != null ? (BaseEntity?)list.Entity : null;
}

public T? NextEntByClass<T>(T? start) where T : BaseEntity {
Expand Down
2 changes: 0 additions & 2 deletions Game.Server/GarrysMod/GMOD_Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,6 @@ public virtual void SetWeaponColor(in Vector3 color) {
public partial EHANDLE Hands { get; set; }
[NetworkVar("m_iMaxArmor")]
public partial int MaxArmor { get; set; }
[NetworkVar("m_flGravity")]
public partial float Gravity { get; set; }
[NetworkVar("m_bSprintEnabled")]
public partial bool SprintEnabled { get; set; }

Expand Down
4 changes: 1 addition & 3 deletions Game.Server/HL2/HL2_Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,7 @@ bool ApplyBattery(float powerMultiplier) {
throw new NotImplementedException();
}

int FlashlightIsOn() {
throw new NotImplementedException();
}
public override bool FlashlightIsOn() => IsEffectActive(EntityEffects.DimLight);

void FlashlightTurnOn() { }

Expand Down
8 changes: 3 additions & 5 deletions Game.Server/HL2MP/HL2MP_Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ public bool ClientCommand(in TokenizedCommand args) {

void CheatImpulseCommands(int impulse) { }

bool ShouldRunRateLimitedCommand(in TokenizedCommand args) {
new bool ShouldRunRateLimitedCommand(in TokenizedCommand args) {
throw new NotImplementedException();
}

Expand All @@ -606,9 +606,7 @@ bool BecomeRagdollOnClient(Vector3 force) {

void CreateRagdollEntity() { }

int FlashlightIsOn() {
throw new NotImplementedException();
}
public override bool FlashlightIsOn() => IsEffectActive(EntityEffects.DimLight);

void FlashlightTurnOn() { }

Expand Down Expand Up @@ -752,7 +750,7 @@ void State_Enter_ACTIVE() { }

void State_PreThink_ACTIVE() { }

bool CanHearAndReadChatFrom(BasePlayer player) => player != null;
public override bool CanHearAndReadChatFrom(BasePlayer player) => player != null;
}

[LinkEntityToClass("hl2mp_ragdoll")]
Expand Down
2 changes: 1 addition & 1 deletion Game.Server/NPC_Breen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Game.Server;
public class NPC_Breen : AI_BaseActor
{
[Flags]
public enum SF
public new enum SF
{
BackgroundTalk = 1 << 16,
}
Expand Down
2 changes: 1 addition & 1 deletion Game.Server/NPC_Citizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public enum CitizenExpressionType
public class NPC_Citizen : NPC_PlayerCompanion
{
[Flags]
public enum SF
public new enum SF
{
Follow = 1 << 16,
Medic = 1 << 17,
Expand Down
2 changes: 1 addition & 1 deletion Game.Server/NPC_MetroPolice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Game.Server;
public class NPC_MetroPolice : AI_BaseActor
{
[Flags]
public enum SF
public new enum SF
{
SimpleVersion = 0x00020000,
AlwaysStitch = 0x00080000,
Expand Down
Loading
Loading