From 0064a1bc37aac75fc4c923b622b1b81706ff6f92 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Fri, 14 Aug 2009 06:42:57 +0000
Subject: Updated files from 1.0.0 branch

svn-id: r43362
---
 backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg | 2 +-
 backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg   | 2 +-
 backends/platform/symbian/src/SymbianActions.cpp             | 2 ++
 backends/platform/symbian/src/portdefs.h                     | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'backends/platform/symbian')

diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index fe82cb7b4e..19b4d67961 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -34,7 +34,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),0,14,0
+#{"ScummVM S60v3"},(0xA0000657),1,0,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 5a8d317fbc..a500e92529 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -32,7 +32,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),0,14,0
+#{"ScummVM UIQ3"},(0xA0000657),1,0,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID
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 *));
-- 
cgit v1.2.3