aboutsummaryrefslogtreecommitdiff
path: root/backends/wince/CEActions.cpp
diff options
context:
space:
mode:
authorNicolas Bacca2004-12-20 23:52:16 +0000
committerNicolas Bacca2004-12-20 23:52:16 +0000
commit347815cdaee6f7207bb40692aa8727952496ff58 (patch)
tree736d02ff7469dae64f471985982f01066ab59519 /backends/wince/CEActions.cpp
parent54d0384b0e213396ca93760112d3251b60fa6ae8 (diff)
downloadscummvm-rg350-347815cdaee6f7207bb40692aa8727952496ff58.tar.gz
scummvm-rg350-347815cdaee6f7207bb40692aa8727952496ff58.tar.bz2
scummvm-rg350-347815cdaee6f7207bb40692aa8727952496ff58.zip
Re-add Smartphone support (sorry for the year lag :p)
svn-id: r16215
Diffstat (limited to 'backends/wince/CEActions.cpp')
-rw-r--r--backends/wince/CEActions.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/backends/wince/CEActions.cpp b/backends/wince/CEActions.cpp
index a10b056775..078e0f75a1 100644
--- a/backends/wince/CEActions.cpp
+++ b/backends/wince/CEActions.cpp
@@ -47,17 +47,21 @@ CEActions::~CEActions() {
void CEActions::init(GameDetector &detector) {
if (!CEDevice::hasSmartphoneResolution())
CEActionsPocket::init(detector);
-#ifdef WIN32_PLATFORM_WFSP
+//#ifdef WIN32_PLATFORM_WFSP
else
CEActionsSmartphone::init(detector);
-#endif
+//#endif
}
-void CEActions::initInstance(OSystem_WINCE3 *mainSystem) {
+void CEActions::initInstanceMain(OSystem_WINCE3 *mainSystem) {
_mainSystem = mainSystem;
+}
+
+void CEActions::initInstanceGame() {
_instance->_initialized = true;
}
+
bool CEActions::initialized() {
return _initialized;
}
@@ -82,7 +86,7 @@ bool CEActions::performMapped(unsigned int keyCode, bool pushed) {
int i;
for (i=0; i<size(); i++) {
- if (_action_mapping[i] == keyCode)
+ if (_action_mapping[i] == keyCode && _action_enabled[i])
return perform((ActionType)i, pushed);
}