diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-10 23:14:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-10 23:14:47 +0300 |
| commit | a3475e987b0e642b2b9aa9c6cbf74762c6c77d23 (patch) | |
| tree | d4d1e3b4640b98ae59ffb982114e708825114234 /src/gui | |
| parent | 3973b3175a1efdb0d47e93b93af6ae5f50cb62f8 (diff) | |
| download | mv-a3475e987b0e642b2b9aa9c6cbf74762c6c77d23.tar.gz mv-a3475e987b0e642b2b9aa9c6cbf74762c6c77d23.tar.bz2 mv-a3475e987b0e642b2b9aa9c6cbf74762c6c77d23.tar.xz mv-a3475e987b0e642b2b9aa9c6cbf74762c6c77d23.zip | |
Add two default keys to input layout.
Add action type to default keys.
Remove hardcoded joystick actions.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setup_input.cpp | 2 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp index cdcae13c4..f4d2f51e1 100644 --- a/src/gui/setup_input.cpp +++ b/src/gui/setup_input.cpp @@ -104,7 +104,7 @@ static SetupActionData const setupActionData[] = }, { N_("Stop Attack"), - Input::KEY_TARGET + Input::KEY_STOP_ATTACK }, { N_("Untarget"), diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 59b7377f4..3b58e03a9 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -511,7 +511,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (player_node != mHoverBeing) { player_node->attack(mHoverBeing, - !inputManager.isActionActive(Input::KEY_TARGET)); + !inputManager.isActionActive( + Input::KEY_STOP_ATTACK)); return; } } |