[Scummvm-cvs-logs] SF.net SVN: scummvm: [22811] scummvm/trunk/base
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Wed May 31 14:14:06 CEST 2006
Revision: 22811
Author: anotherguest
Date: 2006-05-31 14:13:37 -0700 (Wed, 31 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22811&view=rev
Log Message:
-----------
Moved Symbian call to GUI::Actions::init(); to the Symbian backend
Modified Paths:
--------------
scummvm/trunk/backends/symbian/src/SymbianOS.cpp
scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/backends/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/symbian/src/SymbianOS.cpp 2006-05-31 20:19:03 UTC (rev 22810)
+++ scummvm/trunk/backends/symbian/src/SymbianOS.cpp 2006-05-31 21:13:37 UTC (rev 22811)
@@ -97,11 +97,14 @@
#endif
ConfMan.setInt("joystick_num", 0); // Symbian OS should have joystick_num set to 0 in the ini file , but uiq devices might refuse opening the joystick
ConfMan.flushToDisk();
+
+ GUI::Actions::init();
OSystem_SDL::initBackend();
// Initialize global key mapping for Smartphones
GUI::Actions* actions = GUI::Actions::Instance();
+
actions->initInstanceMain(this);
actions->loadMapping();
initZones();
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2006-05-31 20:19:03 UTC (rev 22810)
+++ scummvm/trunk/base/main.cpp 2006-05-31 21:13:37 UTC (rev 22811)
@@ -317,7 +317,7 @@
if (!Base::processSettings(command, settings))
return 0;
-#if defined(__SYMBIAN32__) || defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)
// Init keymap support.
// FIXME: Fingolfin seez: Now that we don't use a detector anymore, this
// could and should be moved to your OSystem::initBackend() method :-)
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