fix

WWhiteDreamProject · Oct 16, 2024 · b69b901 · b69b901
1 parent fab2283
commit b69b901
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/Content.Client/_White/Overlays/NightVisionOverlay.cs b/Content.Client/_White/Overlays/NightVisionOverlay.cs
diff --git a/Content.Client/_White/Overlays/NightVisionSystem.cs b/Content.Client/_White/Overlays/NightVisionSystem.cs
@@ -12,7 +12,7 @@ public sealed class NightVisionSystem : SwitchableOverlaySystem<NightVisionCompo
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
 
-    private NightVisionOverlay _overlay = default!;
+    private BaseSwitchableOverlay<NightVisionComponent> _overlay = default!;
 
     public override void Initialize()
     {
@@ -22,7 +22,7 @@ public override void Initialize()
         SubscribeLocalEvent<NightVisionComponent, PlayerDetachedEvent>(OnPlayerDetached);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
 
-        _overlay = new NightVisionOverlay();
+        _overlay = new BaseSwitchableOverlay<NightVisionComponent>();
     }
 
     private void OnPlayerAttached(EntityUid uid, NightVisionComponent component, PlayerAttachedEvent args)

diff --git a/Content.Client/_White/Overlays/ThermalOverlay.cs b/Content.Client/_White/Overlays/ThermalOverlay.cs
diff --git a/Content.Client/_White/Overlays/ThermalVisionSystem.cs b/Content.Client/_White/Overlays/ThermalVisionSystem.cs
@@ -12,7 +12,7 @@ public sealed class ThermalVisionSystem : SwitchableOverlaySystem<ThermalVisionC
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
 
     private ThermalVisionOverlay _thermalOverlay = default!;
-    private ThermalOverlay _overlay = default!;
+    private BaseSwitchableOverlay<ThermalVisionComponent> _overlay = default!;
 
     public override void Initialize()
     {
@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
 
         _thermalOverlay = new ThermalVisionOverlay();
-        _overlay = new ThermalOverlay();
+        _overlay = new BaseSwitchableOverlay<ThermalVisionComponent>();
     }
 
     private void OnPlayerAttached(EntityUid uid, ThermalVisionComponent component, PlayerAttachedEvent args)

diff --git a/Content.Shared/_White/Overlays/BaseOverlayComponent.cs b/Content.Shared/_White/Overlays/BaseOverlayComponent.cs
@@ -1,6 +1,5 @@
 namespace Content.Shared._White.Overlays;
 
-[RegisterComponent]
 public abstract partial class BaseOverlayComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadOnly)]

diff --git a/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs b/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared._White.Overlays;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentState]
 public abstract partial class SwitchableOverlayComponent : BaseOverlayComponent
 {
     [DataField, AutoNetworkedField]