diff options
author | Lars Persson | 2005-07-05 20:22:56 +0000 |
---|---|---|
committer | Lars Persson | 2005-07-05 20:22:56 +0000 |
commit | d4716a1fb525540f3395262d236df51ef70874f1 (patch) | |
tree | 7e5ddbbd1b7cfb28df2c25f041bf07d487bed662 /base | |
parent | 57858a8757a5b3d96958ec856862886184082652 (diff) | |
download | scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.gz scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.bz2 scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.zip |
* Start of generic key configuration support for ScummVM
* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping. LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.
svn-id: r18498
Diffstat (limited to 'base')
-rw-r--r-- | base/main.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp index d981dbc69e..30b7e6e49f 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -156,6 +156,10 @@ extern "C" int main(int argc, char *argv[]); #include "allegro.h" #endif +#ifdef __SYMBIAN32__ +#include "gui/Actions.h" +#endif + #if defined(UNIX) #include <signal.h> @@ -398,14 +402,20 @@ extern "C" int main(int argc, char *argv[]) { // Load the plugins PluginManager::instance().loadPlugins(); - // Ensure the system object exists (it may have already been created - // at an earlier point, though!) - OSystem &system = OSystem::instance(); - // Parse the command line information #ifndef _WIN32_WCE GameDetector detector; #endif + +#ifdef __SYMBIAN32__ + // init keymap support here: we wanna move this somewhere else? + GUI::Actions::init(detector); +#endif + + // Ensure the system object exists (it may have already been created + // at an earlier point, though!) + OSystem &system = OSystem::instance(); + detector.parseCommandLine(argc, argv); #ifdef __PALM_OS__ |