split components bad

OpenDreamProject · Feb 20, 2025 · ee38d34 · ee38d34
1 parent 0311905
commit ee38d34
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 25 deletions.
diff --git a/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs b/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs
@@ -37,12 +37,11 @@ private void OnDreamParticlesComponentChange(EntityUid uid, DreamParticlesCompon
 
     private void HandleComponentAdd(EntityUid uid, DreamParticlesComponent component, ref ComponentAdd args)
     {
-        component.particlesSystem = _particlesManager.CreateParticleSystem(uid, GetParticleSystemArgs(component));
+        _particlesManager.CreateParticleSystem(uid, GetParticleSystemArgs(component));
     }
 
     private void HandleComponentRemove(EntityUid uid, DreamParticlesComponent component, ref ComponentRemove args)
     {
-        component.particlesSystem = null;
         _particlesManager.DestroyParticleSystem(uid);
     }
 

diff --git a/OpenDreamClient/Rendering/DreamParticlesComponent.cs b/OpenDreamClient/Rendering/DreamParticlesComponent.cs
diff --git a/OpenDreamClient/Rendering/DreamViewOverlay.cs b/OpenDreamClient/Rendering/DreamViewOverlay.cs
@@ -59,7 +59,6 @@ internal sealed partial class DreamViewOverlay : Overlay {
     private readonly ClientImagesSystem _clientImagesSystem;
 
     private readonly EntityQuery<DMISpriteComponent> _spriteQuery;
-    private readonly EntityQuery<DynamicParticlesComponent> _particlesQuery;
     private readonly EntityQuery<TransformComponent> _xformQuery;
     private readonly EntityQuery<DreamMobSightComponent> _mobSightQuery;
 
@@ -91,7 +90,6 @@ public DreamViewOverlay(RenderTargetPool renderTargetPool, TransformSystem trans
         _clientImagesSystem = clientImagesSystem;
 
         _spriteQuery = _entityManager.GetEntityQuery<DMISpriteComponent>();
-        _particlesQuery = _entityManager.GetEntityQuery<DynamicParticlesComponent>();
         _xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
         _mobSightQuery = _entityManager.GetEntityQuery<DreamMobSightComponent>();
 

diff --git a/OpenDreamRuntime/Rendering/DreamParticlesComponent.cs b/OpenDreamRuntime/Rendering/DreamParticlesComponent.cs
diff --git a/OpenDreamShared/Rendering/DreamParticlesComponent.cs b/OpenDreamShared/Rendering/DreamParticlesComponent.cs
@@ -11,8 +11,8 @@
 
 namespace OpenDreamShared.Rendering;
 
-[NetworkedComponent, AutoGenerateComponentState(true)]
-public abstract partial class SharedDreamParticlesComponent : Component {
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class DreamParticlesComponent : Component {
     [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Width;
     [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Height;
     [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Count;