diff --git a/direct/src/controls/ControlManager.py b/direct/src/controls/ControlManager.py index a23c9f839b..cfb226298b 100755 --- a/direct/src/controls/ControlManager.py +++ b/direct/src/controls/ControlManager.py @@ -72,29 +72,6 @@ class ControlManager: inputState.watch("jump", "control", "control-up") - if __dev__: - inputState.watch("slideLeft", "home", "home-up") - inputState.watch("slideRight", "end", "end-up") - inputState.watch("levitateUp", "page_up", "page_up-up") - inputState.watch("levitateDown", "page_down", "page_down-up") - inputState.watch("run", "shift", "shift-up") - - # FYI, ghost mode uses jump for slide. - # inputState.watch("slide", "slide-is-disabled", "slide-is-disabled") - inputState.watch("slide", "mouse3", "mouse3-up") - - # inputState.watch("slideLeft", "shift-arrow_left", "shift-arrow_left-up") - # inputState.watch("slideLeft", "control-arrow_left", "control-arrow_left-up") - # inputState.watch("slideLeft", "alt-arrow_left", "alt-arrow_left-up") - # inputState.watch("slideLeft", "shift-arrow_left", "shift-arrow_left-up") - # inputState.watch("slideLeft", "slide-is-disabled", "slide-is-disabled") - - # inputState.watch("slideRight", "shift-arrow_right", "shift-arrow_right-up") - # inputState.watch("slideRight", "control-arrow_right", "control-arrow_right-up") - # inputState.watch("slideRight", "alt-arrow_right", "alt-arrow_right-up") - # inputState.watch("slideRight", "shift-arrow_right", "shift-arrow_right-up") - # inputState.watch("slideRight", "slide-is-disabled", "slide-is-disabled") - if self.wantWASD: inputState.watch("forward", "w", "w-up") inputState.watch("forward", "control-w", "w-up") @@ -237,14 +214,11 @@ class ControlManager: inputState.ignore("turnLeft") inputState.ignore("turnRight") inputState.ignore("jump") - inputState.ignore("slideLeft") - inputState.ignore("slideRight") inputState.ignore("run") - if __dev__: - inputState.ignore("slide") - inputState.ignore("levitateUp") - inputState.ignore("levitateDown") + if self.wantWASD: + inputState.ignore("slideLeft") + inputState.ignore("slideRight") #self.monitorTask.remove()