Merge pull request #50 from largato/sfx

Allow concurrent sfx
largato · Oct 20, 2018 · f81a9b7 · f81a9b7
2 parents df764b3 + 1e94fdf
commit f81a9b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/gunner.lua b/gunner.lua
@@ -125,7 +125,7 @@ function Gunner:attack()
       self:shoot()
       self.target:receiveDamage(self.damage)
       self:changeState(STATE_IDLE)
-      soundManager:play("laser")
+      soundManager:playSfx("laser")
    else
       self.attacking_timer = self.attacking_timer + 1
    end

diff --git a/melee.lua b/melee.lua
@@ -121,7 +121,7 @@ function Melee:attack()
       self.attacking_timer = 0
       self.target:receiveDamage(self.damage)
       self:changeState(STATE_IDLE)
-      soundManager:play("melee")
+      soundManager:playSfx("melee")
    else
       self.attacking_timer = self.attacking_timer + 1
    end

diff --git a/soundmanager.lua b/soundmanager.lua
@@ -24,6 +24,11 @@ function SoundManager:play(name)
    source:play()
 end
 
+function SoundManager:playSfx(name)
+   local source = self.sounds[name]
+   source:clone():play()
+end
+
 function SoundManager:stop(name)
    local source = self.sounds[name]
    source:stop()