X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fscenes%2Froach_management.py;h=dd05e755404334f6b37394a044a02b30f1ec6f78;hp=4e41b9c538608d0dd7df2097335a772556d1331a;hb=ed7b7dbe49f3962132f0db806552a5873d6fc113;hpb=b4d8e05a494cd8f270eb60efea35b69c16933029 diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py index 4e41b9c..dd05e75 100644 --- a/koperkapel/scenes/roach_management.py +++ b/koperkapel/scenes/roach_management.py @@ -11,6 +11,7 @@ from ..roaches import big_roaches, roach_by_name from ..serums import big_serums, roach_is_serumless, SERUMS from ..vehicles.base import Vehicle from .base import Scene, ChangeSceneEvent, defer_to_update +from ..util import safepath TOOLBAR_LEFT_X = WIDTH * 3 // 4 @@ -135,10 +136,10 @@ class RoachesScene(Scene): def _init_pads(self): self._roach_pad = self._pad_layer.add( - Actor("roach_management/roach_pad", anchor=("left", "bottom"))) + Actor(safepath("roach_management/roach_pad"), anchor=("left", "bottom"))) self._roach_pad.pos = (TOOLBAR_LEFT_X, TOOLBAR_MID_Y) self._inventory_pad = self._pad_layer.add( - Actor("roach_management/inventory_pad", anchor=("left", "top"))) + Actor(safepath("roach_management/inventory_pad"), anchor=("left", "top"))) self._inventory_pad.pos = (TOOLBAR_LEFT_X, TOOLBAR_MID_Y) def _add_button(self, name, anchor, inset, pos, action): @@ -150,23 +151,23 @@ class RoachesScene(Scene): def _init_buttons(self): self._button_layer.clear() self._add_button( - "roach_management/left_button", ("left", "bottom"), (1, -1), + safepath("roach_management/left_button"), ("left", "bottom"), (1, -1), self._roach_pad.bottomleft, self._roach_left) self._add_button( - "roach_management/right_button", ("right", "bottom"), (-1, -1), + safepath("roach_management/right_button"), ("right", "bottom"), (-1, -1), self._roach_pad.bottomright, self._roach_right) self._add_button( - "roach_management/left_button", ("left", "bottom"), (1, -1), + safepath("roach_management/left_button"), ("left", "bottom"), (1, -1), self._inventory_pad.bottomleft, self._inventory_left) self._add_button( - "roach_management/right_button", ("right", "bottom"), (-1, -1), + safepath("roach_management/right_button"), ("right", "bottom"), (-1, -1), self._inventory_pad.bottomright, self._inventory_right) self._add_button( - "roach_management/eject_button", ("right", "top"), (-1, 1), + safepath("roach_management/eject_button"), ("right", "top"), (-1, 1), (TOOLBAR_LEFT_X, TOOLBAR_TOP_Y), self._eject_roach) def _roach_left(self):