aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorKostas Nakos2006-06-11 08:34:56 +0000
committerKostas Nakos2006-06-11 08:34:56 +0000
commit990ff8f0cc0f009f8a9d2329dd32aa034789fc2a (patch)
treea25c818323b43bf591fb50229376e504238fdb9b /backends
parent5fc44412ac7b7be2aa7702a9559a51860586a8f1 (diff)
downloadscummvm-rg350-990ff8f0cc0f009f8a9d2329dd32aa034789fc2a.tar.gz
scummvm-rg350-990ff8f0cc0f009f8a9d2329dd32aa034789fc2a.tar.bz2
scummvm-rg350-990ff8f0cc0f009f8a9d2329dd32aa034789fc2a.zip
correctly load configuration at startup
svn-id: r23021
Diffstat (limited to 'backends')
-rw-r--r--backends/wince/wince-sdl.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index 41955befda..5464b60f08 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -197,7 +197,12 @@ void drawError(char *error) {
void OSystem_WINCE3::initBackend()
{
- //GUI::Actions::init();
+ // Initialize global key mapping
+ GUI::Actions::init();
+ GUI_Actions::Instance()->initInstanceMain(this);
+ GUI_Actions::Instance()->loadMapping();
+
+ loadDeviceConfiguration();
}
int OSystem_WINCE3::getScreenWidth() {
@@ -252,14 +257,7 @@ OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(),
}
if (_hasSmartphoneResolution) _panelVisible = false; // init correctly in smartphones
create_toolbar();
- // Initialize global key mapping for Smartphones
- GUI::Actions::init();
- GUI_Actions::Instance()->initInstanceMain(this);
- GUI_Actions::Instance()->loadMapping();
- //if (_isSmartphone) {
- loadDeviceConfiguration();
- //}
// Mouse backup (temporary code)
_mouseBackupOld = (byte*)malloc(MAX_MOUSE_W * MAX_MOUSE_H * MAX_SCALING * 2);