aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorChris Apers2007-09-01 19:13:04 +0000
committerChris Apers2007-09-01 19:13:04 +0000
commit500481c4ec684bc943ea5e4c30786bec49871629 (patch)
tree97d4899c4a80107d96b9d22dd005eb45935ac538 /engines/scumm/scumm.cpp
parent88b74c5c91478ea017fa247a2f92fab957257122 (diff)
downloadscummvm-rg350-500481c4ec684bc943ea5e4c30786bec49871629.tar.gz
scummvm-rg350-500481c4ec684bc943ea5e4c30786bec49871629.tar.bz2
scummvm-rg350-500481c4ec684bc943ea5e4c30786bec49871629.zip
Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index bab09d731c..cafa060a7d 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1197,12 +1197,7 @@ void ScummEngine::setupScumm() {
}
int maxHeapThreshold = -1;
-#ifdef PALMOS_68K
- if (_game.features & GF_NEW_COSTUMES)
- maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
- else
- maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
-#else
+
if (_game.features & GF_NEW_COSTUMES) {
// Since the new costumes are very big, we increase the heap limit, to avoid having
// to constantly reload stuff from the data files.
@@ -1210,7 +1205,7 @@ void ScummEngine::setupScumm() {
} else {
maxHeapThreshold = 550000;
}
-#endif
+
_res->setHeapThreshold(400000, maxHeapThreshold);
#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))