diff --git a/direct/src/showbase/NonPhysicsWalker.py b/direct/src/showbase/NonPhysicsWalker.py index 9757f504f3..1060f13f33 100755 --- a/direct/src/showbase/NonPhysicsWalker.py +++ b/direct/src/showbase/NonPhysicsWalker.py @@ -157,6 +157,7 @@ class NonPhysicsWalker(DirectObject.DirectObject): turnRight = inputState.isSet("turnRight") slide = inputState.isSet("slide") #jump = inputState.isSet("jump") + pie = inputState.isSet("pie") # Determine what the speeds are based on the buttons: self.speed=(forward and self.avatarControlForwardSpeed or reverse and -self.avatarControlReverseSpeed) @@ -167,6 +168,13 @@ class NonPhysicsWalker(DirectObject.DirectObject): self.rotationSpeed=not slide and ( (turnLeft and self.avatarControlRotateSpeed) or (turnRight and -self.avatarControlRotateSpeed)) + + # No moving allowed while throwing a pie. + if pie: + self.speed = 0 + self.slideSpeed = 0 + self.rotationSpeed = 0 + # How far did we move based on the amount of time elapsed? dt=min(ClockObject.getGlobalClock().getDt(), 0.1) # Check to see if we're moving at all: diff --git a/direct/src/showbase/PhysicsWalker.py b/direct/src/showbase/PhysicsWalker.py index ea2b1af3f3..e75a7d031d 100755 --- a/direct/src/showbase/PhysicsWalker.py +++ b/direct/src/showbase/PhysicsWalker.py @@ -406,6 +406,7 @@ class PhysicsWalker(DirectObject.DirectObject): turnRight = inputState.isSet("turnRight") slide = inputState.isSet("slide") jump = inputState.isSet("jump") + pie = inputState.isSet("pie") # Determine what the speeds are based on the buttons: self.__speed=(forward and self.avatarControlForwardSpeed or reverse and -self.avatarControlReverseSpeed) @@ -415,6 +416,14 @@ class PhysicsWalker(DirectObject.DirectObject): self.__rotationSpeed=not slide and ( (turnLeft and self.avatarControlRotateSpeed) or (turnRight and -self.avatarControlRotateSpeed)) + + # No moving allowed while throwing a pie. + if pie: + self.__speed = 0 + self.__slideSpeed = 0 + self.__rotationSpeed = 0 + jump = 0 + # How far did we move based on the amount of time elapsed? dt=min(ClockObject.getGlobalClock().getDt(), 0.1)