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

[koperkapel.git] / koperkapel / vehicles / base.py

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index 27e1b24d4f0633575ac9519260de5c05d8c1a002..2c1d9bf97d5b2e2109fc7f7cc4fbf129aacd2a5c 100644 (file)
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -5,9 +5,10 @@ import random
 from itertools import chain, islice, repeat
 from pygame.constants import BLEND_RGBA_MULT
 from pgzero.loaders import images
-from ..actors.orientatedsurf import OrientatedSurfActor
+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,28 +126,11 @@ 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)
-        return SeatActor(seat, selected_seat)
-
-
-class SeatActor(OrientatedSurfActor):
-    def __init__(self, seat, selected_seat):
-        self._selected = False
-        self._seat = seat
-        self._selected_seat = selected_seat
-        super().__init__(surf=self._seat, angle=0)
-
-    @property
-    def selected(self):
-        return self._selected
-
-    @selected.setter
-    def selected(self, value):
-        self._selected = value
-        self.surf = self._selected_seat if value else self._seat
+        return SelectableSurfActor(seat, selected_seat)
 
 
 def circle_of_seats(n_seats, **kw):