sync head with branch.

svn-id: r19535
This commit is contained in:
Robert Göffringmann 2005-11-09 19:59:57 +00:00
parent 1f647b48bc
commit d8e7ad7888
2 changed files with 5 additions and 0 deletions

View File

@ -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;

View File

@ -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;
}