[Scummvm-cvs-logs] SF.net SVN: scummvm: [23021] scummvm/trunk/backends/wince/wince-sdl.cpp

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sun Jun 11 10:35:06 CEST 2006


Revision: 23021
Author:   knakos
Date:     2006-06-11 01:34:56 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23021&view=rev

Log Message:
-----------
correctly load configuration at startup

Modified Paths:
--------------
    scummvm/trunk/backends/wince/wince-sdl.cpp
Modified: scummvm/trunk/backends/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/wince/wince-sdl.cpp	2006-06-11 06:32:54 UTC (rev 23020)
+++ scummvm/trunk/backends/wince/wince-sdl.cpp	2006-06-11 08:34:56 UTC (rev 23021)
@@ -197,7 +197,12 @@
 
 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 @@
 	}
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list