diff options
| author | Robert Göffringmann | 2005-11-09 19:59:57 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2005-11-09 19:59:57 +0000 |
| commit | d8e7ad7888c85eb92f57aa130762145a1907902d (patch) | |
| tree | 0d975bfd185cee842f120dcbd8bb620974e59246 /scumm | |
| parent | 1f647b48bc8b955cfb5c36534ef221e3c3002cba (diff) | |
| download | scummvm-rg350-d8e7ad7888c85eb92f57aa130762145a1907902d.tar.gz scummvm-rg350-d8e7ad7888c85eb92f57aa130762145a1907902d.tar.bz2 scummvm-rg350-d8e7ad7888c85eb92f57aa130762145a1907902d.zip | |
sync head with branch.
svn-id: r19535
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 1c811a544a..9488a19526 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 638b8c3002..333b25ac56 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; } |