diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
| commit | ee8191705826d978b7793497fdd307536c709bff (patch) | |
| tree | 6cfbfc9d72bf636d2da373b4d023705207db4685 /src/actionmanager.cpp | |
| parent | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff) | |
| parent | 0c4ed5a9594b849b436fca13c6992dee923915ed (diff) | |
| download | plus-ee8191705826d978b7793497fdd307536c709bff.tar.gz plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2 plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz plus-ee8191705826d978b7793497fdd307536c709bff.zip | |
Merge branch 'temp1' into stable
Diffstat (limited to 'src/actionmanager.cpp')
| -rw-r--r-- | src/actionmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index cc04e60a1..bc7be23a9 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -211,11 +211,11 @@ impHandler(outfit) impHandler0(mouseClick) { - if (!guiInput) + if (!guiInput || !gui) return false; int mouseX, mouseY; - SDL_GetMouseState(&mouseX, &mouseY); + gui->getMouseState(&mouseX, &mouseY); guiInput->simulateMouseClick(mouseX, mouseY, gcn::MouseEvent::RIGHT); return true; } @@ -388,7 +388,7 @@ impHandler0(heal) { if (actorManager) { - if (inputManager.isActionActive(Input::KEY_MOD)) + if (inputManager.isActionActive(Input::KEY_STOP_ATTACK)) { Being *target = player_node->getTarget(); if (!target || target->getType() != ActorSprite::PLAYER) |