diff options
| author | Travis Howell | 2009-06-05 00:21:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-05 00:21:10 +0000 |
| commit | be36b352fca2c3e6ec0ae3b0c33d0028927d5343 (patch) | |
| tree | 7432114864afff3c9e905059059dbbb0350e6eab | |
| parent | fdbc49ab5f4b9320e4cdac8edd427304910d8235 (diff) | |
| download | scummvm-rg350-be36b352fca2c3e6ec0ae3b0c33d0028927d5343.tar.gz scummvm-rg350-be36b352fca2c3e6ec0ae3b0c33d0028927d5343.tar.bz2 scummvm-rg350-be36b352fca2c3e6ec0ae3b0c33d0028927d5343.zip | |
Sound resource 1 is used for queued speech in HE60+ games, and should never be nuked, when expiring resources.
svn-id: r41182
| -rw-r--r-- | engines/scumm/resource.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 874b787615..a3b1a5be77 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -922,7 +922,11 @@ bool ScummEngine::isResourceInUse(int type, int i) const { case rtCostume: return isCostumeInUse(i); case rtSound: - return _sound->isSoundInUse(i); + // Sound resource 1 is used for queued speech + if (_game.heversion >= 60 && i == 1) + return true; + else + return _sound->isSoundInUse(i); case rtCharset: return _charset->getCurID() == i; case rtImage: |