diff options
| author | Norbert Lange | 2009-08-16 16:39:34 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-16 16:39:34 +0000 |
| commit | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (patch) | |
| tree | 3f3a71bc02976024345c5c3e44534055d9c9c4cd /backends/platform/symbian/src | |
| parent | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (diff) | |
| parent | ce30a513acdaab2ca5eacd136cc80ade1beabb3a (diff) | |
| download | scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.gz scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.bz2 scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.zip | |
merge with trunk
svn-id: r43443
Diffstat (limited to 'backends/platform/symbian/src')
| -rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 5f5551422e..58ede5988f 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -104,6 +104,8 @@ SymbianActions::SymbianActions() void SymbianActions::initInstanceMain(OSystem *mainSystem) { int i; + // Need to do this since all old mappings are reset after engineDone + _initialized = false; Actions::initInstanceMain(mainSystem); // Disable all mappings before setting main mappings again diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 3c2286d154..9059ae9e49 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -127,7 +127,9 @@ #define USE_ARM_COSTUME_ASM #define USE_ARM_SOUND_ASM #endif -#define ENABLE_KEYMAPPER +// This is not really functioning yet. +// Default SDL keys should map to standard keys I think! +//#define ENABLE_KEYMAPPER // Symbian bsearch implementation is flawed void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)); |