From ea5ee97c6a45a8d2bb6af1f9b0f7162e649fab95 Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Sun, 23 Sep 2007 06:32:14 +0000 Subject: [PATCH] when enabling controls, set wasd turn to whatever was set last in case mouse is held down --- direct/src/controls/ControlManager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/controls/ControlManager.py b/direct/src/controls/ControlManager.py index 7d4c29117c..f6f9c3c890 100755 --- a/direct/src/controls/ControlManager.py +++ b/direct/src/controls/ControlManager.py @@ -27,6 +27,7 @@ class ControlManager: self.passMessagesThrough = passMessagesThrough self.inputStateTokens = [] self.WASDTurnTokens = [] + self.__WASDTurn = True self.controls = {} self.currentControls = None self.currentControlsName = None @@ -223,9 +224,9 @@ class ControlManager: ist.append(inputState.watchWithModifiers("slideLeft", "q", inputSource=inputState.QE)) ist.append(inputState.watchWithModifiers("slideRight", "e", inputSource=inputState.QE)) - # Used to switch between strafe and turn. We will default to turn + # Used to switch between strafe and turn. We will reset to whatever was last set. self.WASDTurnTokens = [] - self.setWASDTurn(1) + self.setWASDTurn(self.__WASDTurn) else: ist.append(inputState.watchWithModifiers("turnLeft", "arrow_left", inputSource=inputState.ArrowKeys)) ist.append(inputState.watch("turnLeft", "mouse-look_left", "mouse-look_left-done")) @@ -306,6 +307,7 @@ class ControlManager: def setWASDTurn(self, turn): + self.__WASDTurn = turn if not self.isEnabled: return