summaryrefslogtreecommitdiff
path: root/src/touchactions.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-31 17:33:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-31 17:33:44 +0300
commit021fa9fe787fe4dd1a6d97b77e94400fac179f23 (patch)
tree05eebf64884503a17766f1755344568087fec0b2 /src/touchactions.cpp
parentea886eaeabe20e5a51e91ec58067e2ebc20d4f99 (diff)
downloadmanaplus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.gz
manaplus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.bz2
manaplus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.xz
manaplus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.zip
Add support for changable actions for onscreen controls.
Diffstat (limited to 'src/touchactions.cpp')
-rw-r--r--src/touchactions.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index d45e4a7c3..574836b6d 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -21,7 +21,9 @@
#include "touchactions.h"
#include "actionmanager.h"
+#include "configuration.h"
#include "game.h"
+#include "inputmanager.h"
#include "logger.h"
#include "mouseinput.h"
#include "touchmanager.h"
@@ -37,7 +39,9 @@ int haldJoyPad = 50;
impHandler0(showKeyboard)
{
- ActionManager::showKeyboard(tempEvent);
+ inputManager.executeAction(config.getIntValue("screenActionKeyboard"));
+
+// ActionManager::showKeyboard(tempEvent);
}
void setHalfJoyPad(int s)