aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorChris Apers2003-12-02 11:17:21 +0000
committerChris Apers2003-12-02 11:17:21 +0000
commitcf682ed8f7fb4325897b1692f40bbb9d073ed70e (patch)
tree646eb985337633087f79b1829931b7ea49e5dc8f /scumm
parent182285508d04ac581bd5255c8df17db6a30b6ef0 (diff)
downloadscummvm-rg350-cf682ed8f7fb4325897b1692f40bbb9d073ed70e.tar.gz
scummvm-rg350-cf682ed8f7fb4325897b1692f40bbb9d073ed70e.tar.bz2
scummvm-rg350-cf682ed8f7fb4325897b1692f40bbb9d073ed70e.zip
Added memory auto-configuration on PalmOS for better speed and compatibility
svn-id: r11472
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index be19c99993..9e2c327f0a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -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::go() {
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.