diff options
| author | Travis Howell | 2004-02-11 03:21:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-02-11 03:21:21 +0000 |
| commit | 054edc1591a26eb178f7befb30d0cb8f3979c6ba (patch) | |
| tree | 434822ad2dae68771bb20af2c0cad12614ca4253 | |
| parent | e69c822c28e88f8f9c0cb8ba4125c870e47176ed (diff) | |
| download | scummvm-rg350-054edc1591a26eb178f7befb30d0cb8f3979c6ba.tar.gz scummvm-rg350-054edc1591a26eb178f7befb30d0cb8f3979c6ba.tar.bz2 scummvm-rg350-054edc1591a26eb178f7befb30d0cb8f3979c6ba.zip | |
Hack no longer required.
Add stub for HE games.
svn-id: r12818
| -rw-r--r-- | scumm/resource.cpp | 7 | ||||
| -rw-r--r-- | scumm/sound.cpp | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 541e8a99ff..d2784d59c4 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -1804,13 +1804,6 @@ void ScummEngine::nukeResource(int type, int idx) { if (!res.address[type]) return; - // FIXME hack around insanely high string resource idx's - if ((_features & GF_HUMONGOUS) && (type == 7 && idx > res.num[7])) { - warning("nukeResource: type %d index %d > max %d", type, idx, - res.num[7]); - return; - } - assert(idx >= 0 && idx < res.num[type]); if ((ptr = res.address[type][idx]) != NULL) { diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 47e37eac3a..8adfd34ee7 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -699,6 +699,14 @@ bool Sound::isSoundInQueue(int sound) const { void Sound::stopSound(int a) { int i; + if (_vm->_features & GF_HUMONGOUS) { + if (a == -2) { + // Stop current sfx + } else if (a == -1) { + // Stop current music + } + } + if (a != 0 && a == _currentCDSound) { _currentCDSound = 0; stopCD(); |