[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.489,2.490

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv23934/scumm

Modified Files:
	scummvm.cpp 
Log Message:
Added memory auto-configuration on PalmOS for better speed and compatibility

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.489
retrieving revision 2.490
diff -u -d -r2.489 -r2.490
--- scummvm.cpp	2 Dec 2003 08:12:38 -0000	2.489
+++ scummvm.cpp	2 Dec 2003 11:17:20 -0000	2.490
@@ -55,6 +55,10 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
+#ifndef __PALM_OS__
+#include "globals.h"
+#endif
+
 #ifdef MACOSX
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -856,10 +860,10 @@
 void ScummEngine::launch() {
 
 #ifdef __PALM_OS__
-	// revert to old value (450000) and make ScummVM works again in some devices with same problem as below.
-	// 2500000 is too big and make ScummVM crashes : MemMove to NULL or immediate exit if try to allocate
-	// memory with new operator
-	_maxHeapThreshold = 450000;
+	if (_features & GF_NEW_COSTUMES)
+		_maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
+	else
+		_maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
 #else
 	// Since the new costumes are very big, we increase the heap limit, to avoid having
 	// to constantly reload stuff from the data files.