[Scummvm-cvs-logs] SF.net SVN: scummvm:[43362] scummvm/trunk/backends/platform/symbian

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Fri Aug 14 08:42:57 CEST 2009


Revision: 43362
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43362&view=rev
Author:   anotherguest
Date:     2009-08-14 06:42:57 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Updated files from 1.0.0 branch

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
    scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
    scummvm/trunk/backends/platform/symbian/src/portdefs.h

Modified: scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2009-08-14 06:09:33 UTC (rev 43361)
+++ scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2009-08-14 06:42:57 UTC (rev 43362)
@@ -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"}

Modified: scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2009-08-14 06:09:33 UTC (rev 43361)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2009-08-14 06:42:57 UTC (rev 43362)
@@ -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

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2009-08-14 06:09:33 UTC (rev 43361)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2009-08-14 06:42:57 UTC (rev 43362)
@@ -104,6 +104,8 @@
 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

Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h	2009-08-14 06:09:33 UTC (rev 43361)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h	2009-08-14 06:42:57 UTC (rev 43362)
@@ -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 *));


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