diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-24 16:34:36 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-24 16:34:36 (GMT) |
| commit | beb0e8084932c437d68bbbf7efb82734e5d01ef1 (patch) | |
| tree | 8c13f2bf46c30577ca3e01337566b25dfb0d17ef /src/game/GameController.cpp | |
| parent | 7ead5edd5f2f6ed8e3b62adcc25d897ddba5fb3c (diff) | |
| download | powder-beb0e8084932c437d68bbbf7efb82734e5d01ef1.zip powder-beb0e8084932c437d68bbbf7efb82734e5d01ef1.tar.gz | |
Prevent key overlap for Stickman movement and Gravity/Debug/Stamp actions, fixes #81
Diffstat (limited to 'src/game/GameController.cpp')
| -rw-r--r-- | src/game/GameController.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 48632a7..47c9c0f 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -590,6 +590,22 @@ bool GameController::KeyPress(int key, Uint16 character, bool shift, bool ctrl, { sim->player2.comm = (int)(sim->player2.comm)|0x04; //Jump command } + + if((!sim->elementCount[PT_STKM2] || ctrl) && gameView->GetSelectMode() == SelectNone) + { + switch(key) + { + case 'w': + SwitchGravity(); + break; + case 'd': + gameView->ToggleDebug(); + break; + case 's': + gameView->BeginStampSelection(); + break; + } + } } return ret; } |