From 5926035d84e5e4b06b0caa876398904a102e80ed Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Tue, 18 Sep 2007 00:49:45 +0000 Subject: [PATCH] fixing bug where collision were deactivated upon releasing the ship's wheel --- direct/src/controls/ShipPilot.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/direct/src/controls/ShipPilot.py b/direct/src/controls/ShipPilot.py index dcf004ade7..18cc613993 100755 --- a/direct/src/controls/ShipPilot.py +++ b/direct/src/controls/ShipPilot.py @@ -611,7 +611,8 @@ class ShipPilot(PhysicsWalker): Activate the arrow keys, etc. """ assert self.debugPrint("enableShipControls()") - assert self.collisionsActive + + self.setCollisionsActive(1) if __debug__: #self.accept("control-f3", self.spawnTest) #*# @@ -638,6 +639,9 @@ class ShipPilot(PhysicsWalker): taskName = "ShipControlsIndicator%s"%(id(self),) taskMgr.remove(taskName) + if self.ship: + self.ship.worldVelocity = Vec3(0) + if __debug__: self.ignore("control-f3") #*# self.ignore("f3")