Change logic for emitting sound events.

isadorasophia · Dec 3, 2023 · 68b9846 · 68b9846
1 parent 192a2db
commit 68b9846
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Murder.Editor/Systems/Debug/AnimationEventDebugSystem.cs b/src/Murder.Editor/Systems/Debug/AnimationEventDebugSystem.cs
@@ -28,6 +28,7 @@ public void OnMessage(World world, Entity entity, IMessage message)
         }
 
         AnimationEventMessage msg = (AnimationEventMessage)message;
-        DebugServices.DrawText(world, msg.Event, entity.GetGlobalTransform().Vector2 + new System.Numerics.Vector2(Game.Random.NextFloat(-5, 5), Game.Random.NextFloat(-5, 5)), 0.5f);
+        DebugServices.DrawText(world, msg.Event, entity.GetGlobalTransform().Vector2 + 
+            new System.Numerics.Vector2(Game.Random.NextFloat(-5, 5), Game.Random.NextFloat(-5, 5)), 0.5f);
     }
 }
diff --git a/src/Murder/Services/EntityServices.cs b/src/Murder/Services/EntityServices.cs
@@ -287,6 +287,12 @@ public static void Spawn(World world, Vector2 spawnerPosition, Guid entityToSpaw
 
         public static bool IsInCamera(this Entity e, World world)
         {
+            if (!e.HasTransform())
+            {
+                // No transform? Assume it's ~*everywhere~*.
+                return true;
+            }
+
             Point p = e.GetGlobalTransform().Point;
 
             return ((MonoWorld)world).Camera.SafeBounds.Contains(p);

diff --git a/src/Murder/Systems/Effects/EventListenerSystem.cs b/src/Murder/Systems/Effects/EventListenerSystem.cs
@@ -29,7 +29,7 @@ public void OnMessage(World world, Entity entity, IMessage message)
 
             // Were we actually listening to this particular event?
             ImmutableDictionary<string, SpriteEventInfo> events = entity.GetEventListener().Events;
-            if (events.TryGetValue(animationEvent.Event, out SpriteEventInfo info))
+            if (entity.IsInCamera(world) && events.TryGetValue(animationEvent.Event, out SpriteEventInfo info))
             {
                 // Start doing event actions.
                 if (info.Sound is SoundEventId sound)