X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fvehicles%2Fbase.py;h=2c1d9bf97d5b2e2109fc7f7cc4fbf129aacd2a5c;hp=ba21bbeb94857284f829ebbb8ccc1c731d84ee9e;hb=ec18a4dde4d14bd4486fb936476266e8511b169b;hpb=3a22af1a0404b9bbbf7523b9337b84f6587bb004 diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py index ba21bbe..2c1d9bf 100644 --- a/koperkapel/vehicles/base.py +++ b/koperkapel/vehicles/base.py @@ -8,6 +8,7 @@ from pgzero.loaders import images from ..actors.orientatedsurf import SelectableSurfActor from ..actors.animsurf import AnimatedSurfActor from ..weapons import default_weapons +from ..util import safepath class Vehicle: @@ -24,12 +25,12 @@ class Vehicle: self.game_pos = (0, 0) def roach_management_overlay(self): - return images.load("vehicles/walking/background") + return images.load(safepath("vehicles/walking/background")) def roach_management_frame(self): if self.overlay_frame_no is None: return None - return images.load("vehicle_big/%s_%d" % ( + return images.load(safepath("vehicle_big/%s_%d") % ( self.vehicle_type, self.overlay_frame_no)) def init_seats(self): @@ -92,7 +93,7 @@ class Vehicle: cls.register(Roomba) def _avatar_frame(self, i, weapon, suffix="_tiles"): - vehicle = images.load("vehicle%s/%s_%d" % ( + vehicle = images.load(safepath("vehicle%s/%s_%d") % ( suffix, self.vehicle_type, i + 1)) frame = vehicle.copy() frame.blit(weapon.surf, (0, 0)) @@ -125,7 +126,7 @@ class Seat: self.vehicle_pos = (pos[0] * vrad, pos[1] * vrad) def actor(self): - seat = images.load("vehicles/walking/seat") + seat = images.load(safepath("vehicles/walking/seat")) selected_seat = seat.copy() selected_seat.fill( self.vehicle.selected_seat_overlay_color, None, BLEND_RGBA_MULT)