[Scummvm-cvs-logs] SF.net SVN: scummvm:[33619] scummvm/branches/branch-0-12-0

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Mon Aug 4 20:15:22 CEST 2008


Revision: 33619
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33619&view=rev
Author:   anotherguest
Date:     2008-08-04 18:15:17 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
List the correct engines in about, 
updated actions with Lure (from WinCE). 
Increased min heap size to 5MB

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
    scummvm/branches/branch-0-12-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
    scummvm/branches/branch-0-12-0/backends/platform/symbian/src/SymbianActions.cpp
    scummvm/branches/branch-0-12-0/backends/platform/symbian/src/main_features.inl
    scummvm/branches/branch-0-12-0/common/hashmap.h

Modified: scummvm/branches/branch-0-12-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in	2008-08-04 18:14:17 UTC (rev 33618)
+++ scummvm/branches/branch-0-12-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in	2008-08-04 18:15:17 UTC (rev 33619)
@@ -50,7 +50,7 @@
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	3000000 64000000
+EPOCHEAPSIZE	5000000 64000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps

Modified: scummvm/branches/branch-0-12-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2008-08-04 18:14:17 UTC (rev 33618)
+++ scummvm/branches/branch-0-12-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2008-08-04 18:15:17 UTC (rev 33619)
@@ -51,7 +51,7 @@
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	3000000 64000000
+EPOCHEAPSIZE	5000000 64000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps

Modified: scummvm/branches/branch-0-12-0/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/symbian/src/SymbianActions.cpp	2008-08-04 18:14:17 UTC (rev 33618)
+++ scummvm/branches/branch-0-12-0/backends/platform/symbian/src/SymbianActions.cpp	2008-08-04 18:15:17 UTC (rev 33619)
@@ -140,6 +140,8 @@
 	bool is_touche = (gameid == "touche");
 	bool is_agi = (gameid == "agi");
 	bool is_parallaction = (gameid == "parallaction");
+	bool is_lure = (gameid == "lure");
+	bool is_feeble = (gameid == "feeble");
 
 	Actions::initInstanceGame();
 
@@ -175,7 +177,7 @@
 	// Skip text
 	if (!is_cine && !is_parallaction)
 		_action_enabled[ACTION_SKIP_TEXT] = true;
-	if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_saga || is_kyra || is_touche)
+	if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_saga || is_kyra || is_touche || is_lure || is_feeble)
 		_key_action[ACTION_SKIP_TEXT].setKey(Common::KEYCODE_ESCAPE, Common::KEYCODE_ESCAPE); // Escape key
 	else {
 		_key_action[ACTION_SKIP_TEXT].setKey(SDLK_PERIOD);

Modified: scummvm/branches/branch-0-12-0/backends/platform/symbian/src/main_features.inl
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/symbian/src/main_features.inl	2008-08-04 18:14:17 UTC (rev 33618)
+++ scummvm/branches/branch-0-12-0/backends/platform/symbian/src/main_features.inl	2008-08-04 18:15:17 UTC (rev 33619)
@@ -27,62 +27,61 @@
 
 // we want a list of supported engines visible in the program,
 // because we also release special builds with only one engine
-#ifndef DISABLE_SCUMM
+#ifdef ENABLE_SCUMM
 	"SCUMM "
 #endif
-#ifndef DISABLE_AGOS
+#ifdef ENABLE_AGOS
 	"AGOS "
 #endif
-#ifndef DISABLE_SKY
+#ifdef ENABLE_SKY
 	"Sky "
 #endif
-#ifndef DISABLE_QUEEN
+#ifdef ENABLE_QUEEN
 	"Queen "
 #endif
-#ifndef DISABLE_GOB
+#ifdef ENABLE_GOB
 	"Gob "
 #endif
-#ifndef DISABLE_SAGA
+#ifdef ENABLE_SAGA
 	"Saga "
 #endif
-#ifndef DISABLE_KYRA
+#ifdef ENABLE_KYRA
 	"Kyra "
 #endif
-#ifndef DISABLE_SWORD1
+#ifdef ENABLE_SWORD1
 	"Sword1 "
 #endif
-#ifndef DISABLE_SWORD2
+#ifdef ENABLE_SWORD2
 	"Sword2 "
 #endif
-#ifndef DISABLE_CINE
+#ifdef ENABLE_CINE
 	"Cine "
 #endif
-#ifndef DISABLE_LURE
+#ifdef ENABLE_LURE
 	"Lure "
 #endif
-#ifndef DISABLE_AGI
+#ifdef ENABLE_AGI
 	"AGI "
 #endif
-#ifndef DISABLE_TOUCHE
+#ifdef ENABLE_TOUCHE
 	"Touche "
 #endif
-#ifndef DISABLE_DRASCULA
+#ifdef ENABLE_DRASCULA
 	"Drascula "
 #endif
-#ifndef DISABLE_IGOR
+#ifdef ENABLE_IGOR
 	"Igor "
 #endif
-#ifndef DISABLE_PARALLACTION
+#ifdef ENABLE_PARALLACTION
 	"Parallaction "
 #endif
-#ifndef DISABLE_CRUISE
+#ifdef ENABLE_CRUISE
 	"Cruise "
 #endif
-#ifndef DISABLE_MADE
+#ifdef ENABLE_MADE
 	"MADE "
 #endif
-
-#ifndef DISABLE_M4
+#ifdef ENABLE_M4
 	"M4 "
 #endif
 

Modified: scummvm/branches/branch-0-12-0/common/hashmap.h
===================================================================
--- scummvm/branches/branch-0-12-0/common/hashmap.h	2008-08-04 18:14:17 UTC (rev 33618)
+++ scummvm/branches/branch-0-12-0/common/hashmap.h	2008-08-04 18:15:17 UTC (rev 33619)
@@ -58,21 +58,19 @@
 #include "common/str.h"
 #include "common/util.h"
 
-// FIXME: Since this define is very system dependant, 
-// it should be moved to the appropriate H file instead.
-// Portdefs might be a good location for example
-#if !defined(__SYMBIAN32__)
 #define USE_HASHMAP_MEMORY_POOL
-#endif
-
 #ifdef USE_HASHMAP_MEMORY_POOL
 #include "common/memorypool.h"
 // FIXME: we sadly can't assume standard C++ to be present
 // on every system we support, so we should get rid of this.
 // The solution should be to write a simple placement new
 // on our own.
+
+// Symbian does not have <new> but the new operator 
+#if !defined(__SYMBIAN32__) 
 #include <new>
 #endif
+#endif
 
 namespace Common {
 


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