From: Simon Cross Date: Sat, 5 Mar 2016 19:52:27 +0000 (+0200) Subject: Merge branch 'master' of ctpug.org.za:koperkapel X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=ec18a4dde4d14bd4486fb936476266e8511b169b;p=koperkapel.git Merge branch 'master' of ctpug.org.za:koperkapel --- ec18a4dde4d14bd4486fb936476266e8511b169b diff --cc koperkapel/vehicles/base.py index ba21bbe,3d7765c..2c1d9bf --- a/koperkapel/vehicles/base.py +++ b/koperkapel/vehicles/base.py @@@ -5,9 -5,10 +5,10 @@@ import rando 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: