X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Froaches.py;h=1d77563953442090efc97e766d62d0dd243569d2;hb=1c447e762b427f53c02c2463afaed2e21ca91d66;hp=b708a88b9b0219f65bee7656b924362113cca6a8;hpb=94041e07b1111324d2666a1f3aa2ea5cdbdbb805;p=koperkapel.git

diff --git a/koperkapel/roaches.py b/koperkapel/roaches.py
index b708a88..1d77563 100644
--- a/koperkapel/roaches.py
+++ b/koperkapel/roaches.py
@@ -4,6 +4,7 @@ from pgzero.loaders import images
 from pygame.constants import BLEND_RGBA_MULT
 from .actors.animsurf import AnimatedSurfActor
 from .serums import roach_serum_color
+from .util import safepath
 
 NAMES = [
     "roupert",
@@ -75,8 +76,8 @@ class RoachFactory:
         self.frames = 4
 
     def assemble_frame(self, i, color, roach_data, weapon=None):
-        roach = images.load("roach%s/roach_%d" % (self.suffix, i + 1))
-        eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
+        roach = images.load(safepath("roach%s/roach_%d") % (self.suffix, i + 1))
+        eyes = images.load(safepath("roach%s/eyes_%d") % (self.suffix, i + 1))
         if weapon is None:
             frame = roach.copy()
             frame.fill(color, None, BLEND_RGBA_MULT)
@@ -88,8 +89,9 @@ class RoachFactory:
         frame.blit(eyes, (0, 0))
         return frame
 
-    def assemble(self, roach_data, weapon=None):
-        color = roach_serum_color(roach_data)
+    def assemble(self, roach_data, color=None, weapon=None):
+        if not color:
+            color = roach_serum_color(roach_data)
         frames = []
         frames = [
             self.assemble_frame(i, color, roach_data, weapon)