Merge branch 'master' of ctpug.org.za:koperkapel

diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py
index 3ef987919c9820b4bef15792b759376fc6f20914..f07caedb2404ae802bc94f280ea839fc9a38f621 100644 (file)
--- a/koperkapel/weapons.py
+++ b/koperkapel/weapons.py
@@ -1,6 +1,6 @@
 """ Tools for dealing with weapons. """
 
-from pgzero.loaders import images
+from pgzero.loaders import images, sounds
 from .actors.animsurf import AnimatedSurfActor
 from .util import safepath
 
@@ -14,7 +14,9 @@ class Weapon:
         self.damage = damage
         self.bullet_range = bullet_range
         self.can_tape = can_tape
-        self.sound = sound
+        self.sound = None
+        if sound:
+            self.sound = sounds.load(sound)
 
 
 WEAPONS = [