From d8e7ad7888c85eb92f57aa130762145a1907902d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20G=C3=B6ffringmann?= Date: Wed, 9 Nov 2005 19:59:57 +0000 Subject: [PATCH] sync head with branch. svn-id: r19535 --- scumm/imuse_digi/dimuse_track.cpp | 2 ++ scumm/scumm.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 1c811a544a2..9488a19526c 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -82,7 +82,9 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, // processing is done by another thread, we also call parseEvents to // give it some time (and to avoid busy waiting/looping). flushTracks(); +#ifndef __PLAYSTATION2__ _vm->parseEvents(); +#endif } track->pan = 64; diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 638b8c30021..333b25ac56c 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1754,6 +1754,9 @@ int ScummEngine::init(GameDetector &detector) { // Since the new costumes are very big, we increase the heap limit, to avoid having // to constantly reload stuff from the data files. res._maxHeapThreshold = 2500000; +#ifdef __PLAYSTATION2__ + res._maxHeapThreshold = 6 * 1024 * 1024; +#endif } else { res._maxHeapThreshold = 550000; }