X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fweapons.py;h=890743dbe5ccb5fb1338006a762f7874aae2a3d6;hb=cbadf4e3132cb94acd2c17b13ca9a8f0da91cf9d;hp=d09c570b9a33d04e6b7ee3f44d00d3a8f6553730;hpb=96dd67b1005fa0123f96409cecb62ae1a2342152;p=koperkapel.git

diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py
index d09c570..890743d 100644
--- a/koperkapel/weapons.py
+++ b/koperkapel/weapons.py
@@ -2,11 +2,12 @@
 
 from pgzero.loaders import images
 from .actors.animsurf import AnimatedSurfActor
+from .util import safepath
 
 
 class Weapon:
     def __init__(self, name, damage, image_name=None, bullet_range=0,
-                 can_tape=True, frames=("_1", "_2")):
+                 can_tape=True, frames=("_1",)):
         self.name = name
         self.image_name = image_name or name
         self.frames = frames
@@ -35,10 +36,11 @@ class WeaponActor(AnimatedSurfActor):
 class WeaponFactory:
 
     def assemble_frame(self, suffix, weapon, tape):
-        surf = images.load("weapons/%s%s" % (weapon.image_name, suffix))
+        surf = images.load(safepath("weapons/%s%s")
+                            % (weapon.image_name, suffix))
         frame = surf.copy()
         if tape:
-            tape_surf = images.load("weapons/tape")
+            tape_surf = images.load(safepath("weapons/tape"))
             frame.blit(tape_surf, (0, 0))
         return frame