Added trigger for when spawning is started and stopped

OlaOst · Apr 11, 2012 · 91d8f84 · 91d8f84
1 parent bdc73c0
commit 91d8f84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/data/engine.txt b/data/engine.txt
@@ -10,7 +10,10 @@ torqueForce = 50.0
 slideForce = 25.0
 
 
+#spawn.sound.soundFile = 59__fectoper__nostromo.wav
 spawn.sound.soundFile = engine.wav
+# we only want the sound to play once when engines fire - not every frame while the engines are firing
+spawn.sound.trigger = startSpawning
 
 spawn.exhaust.radius = 1.0
 spawn.exhaust.lifetime = 0.2

diff --git a/src/CommsCentral.d b/src/CommsCentral.d
@@ -282,8 +282,16 @@ void setSpawnerFromController(Controller controller, Spawner spawner)
 {
   subSystemCommunication!(ControlComponent, SpawnerComponent)(controller, spawner, (ControlComponent controllerComponent, SpawnerComponent spawnerComponent)
   {
+    spawnerComponent.startSpawning = (spawnerComponent.isSpawning == false && 
+                                      controllerComponent.isFiring && 
+                                      spawnerComponent.startSpawning == false);
+
     spawnerComponent.isSpawning = controllerComponent.isFiring;
 
+    spawnerComponent.stopSpawning = (spawnerComponent.isSpawning && 
+                                     controllerComponent.isFiring == false && 
+                                     spawnerComponent.stopSpawning);
+
     return spawnerComponent;
   });
 }

diff --git a/src/SubSystem/Spawner.d b/src/SubSystem/Spawner.d
@@ -72,7 +72,9 @@ struct SpawnerComponent
   int entityId;
   int ownerId;
 
+  bool startSpawning = false;
   bool isSpawning = false;
+  bool stopSpawning = false;
 }
 
 
@@ -87,10 +89,12 @@ public:
     foreach (ref component; components)
     {
       //writeln("spawner.update: " ~ to!string(component.entityId) ~ ": " ~ to!string(component.isSpawning));
-
-      if (component.isSpawning)
+      
+      foreach (spawnName, spawnValuesOriginal; component.spawnValuesNames)
       {
-        foreach (spawnName, spawnValuesOriginal; component.spawnValuesNames)
+        if ((component.isSpawning && ("trigger" !in spawnValuesOriginal || spawnValuesOriginal["trigger"] == "isSpawning")) ||
+            (component.startSpawning && "trigger" in spawnValuesOriginal && spawnValuesOriginal["trigger"] == "startSpawning") ||
+            (component.stopSpawning && "trigger" in spawnValuesOriginal && spawnValuesOriginal["trigger"] == "stopSpawning"))
         {
           string[string] spawnValues = spawnValuesOriginal.dup;