diff options
| author | Max Horn | 2002-12-26 21:50:13 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-26 21:50:13 +0000 |
| commit | ad7fefd34eb81ab473293c4072432b36608d93aa (patch) | |
| tree | e510c3c891268394cf1659241bf8e079be017c98 /scumm/sound.cpp | |
| parent | 966d435a19930ae357b333d731f6b70e91b5a351 (diff) | |
| download | scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.gz scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.bz2 scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.zip | |
map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 867d2095b2..78afbe5fa3 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1106,8 +1106,18 @@ void Sound::bundleMusicHandler(Scumm * scumm) { int Sound::playBundleSound(char *sound) { byte * ptr; - - if (_scumm->_bundle->openVoiceFile("digvoice.bun", _scumm->getGameDataPath()) == false) { + bool result; + + if (_scumm->_gameId == GID_CMI) + // FIXME: HACK! There are actually two voice files in COMI... I dunno how to do this + // right, though :-/ + result = _scumm->_bundle->openVoiceFile("voxdisk1.bun", _scumm->getGameDataPath()); + else if (_scumm->_gameId == GID_DIG) + result = _scumm->_bundle->openVoiceFile("digvoice.bun", _scumm->getGameDataPath()); + else + error("Don't know which bundle file to load"); + + if (!result) { return -1; } |