From 2bfb124591b4ebc00bf2307b6ad4a32bf0d2f7c3 Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Wed, 9 Apr 2008 19:05:09 +0000 Subject: [PATCH] want-running 0 now turns off ~run --- direct/src/controls/BattleWalker.py | 2 +- direct/src/controls/GravityWalker.py | 2 +- direct/src/controls/ShipPilot.py | 2 +- direct/src/controls/ShipPilot2.py | 13 ++++++------- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/direct/src/controls/BattleWalker.py b/direct/src/controls/BattleWalker.py index 335c1fe67a..922ce7bfee 100755 --- a/direct/src/controls/BattleWalker.py +++ b/direct/src/controls/BattleWalker.py @@ -54,7 +54,7 @@ class BattleWalker(GravityWalker.GravityWalker): debugRunning = inputState.isSet("debugRunning") - if(debugRunning and __dev__): + if(debugRunning): self.speed*=base.debugRunningMultiplier self.slideSpeed*=base.debugRunningMultiplier self.rotationSpeed*=1.25 diff --git a/direct/src/controls/GravityWalker.py b/direct/src/controls/GravityWalker.py index df82e649cc..250390a4be 100755 --- a/direct/src/controls/GravityWalker.py +++ b/direct/src/controls/GravityWalker.py @@ -503,7 +503,7 @@ class GravityWalker(DirectObject.DirectObject): (turnRight and -self.avatarControlRotateSpeed)) debugRunning = inputState.isSet("debugRunning") - if(debugRunning and __dev__): + if(debugRunning): self.speed*=base.debugRunningMultiplier self.slideSpeed*=base.debugRunningMultiplier self.rotationSpeed*=1.25 diff --git a/direct/src/controls/ShipPilot.py b/direct/src/controls/ShipPilot.py index c2340cc663..3fbe1c25a9 100755 --- a/direct/src/controls/ShipPilot.py +++ b/direct/src/controls/ShipPilot.py @@ -413,7 +413,7 @@ class ShipPilot(PhysicsWalker): # Enable debug turbo modec debugRunning = inputState.isSet("debugRunning") - if(debugRunning and __dev__): + if(debugRunning): self.__speed*=base.debugRunningMultiplier self.__slideSpeed*=base.debugRunningMultiplier self.__rotationSpeed*=1.25 diff --git a/direct/src/controls/ShipPilot2.py b/direct/src/controls/ShipPilot2.py index 987831bf10..e294a8304b 100755 --- a/direct/src/controls/ShipPilot2.py +++ b/direct/src/controls/ShipPilot2.py @@ -666,13 +666,12 @@ class ShipPilot2(PhysicsWalker): # Enable debug turbo mode maxSpeed = self.ship.maxSpeed * straightSailBonus - if __debug__: - debugRunning = inputState.isSet("debugRunning") - if debugRunning or base.localAvatar.getTurbo(): - self.__speed*=4.0 - self.__slideSpeed*=4.0 - self.__rotationSpeed*=1.25 - maxSpeed = self.ship.maxSpeed * 4.0 + debugRunning = inputState.isSet("debugRunning") + if debugRunning or base.localAvatar.getTurbo(): + self.__speed*=4.0 + self.__slideSpeed*=4.0 + self.__rotationSpeed*=1.25 + maxSpeed = self.ship.maxSpeed * 4.0 #self.__speed*=4.0 #self.__slideSpeed*=4.0