diff options
| author | Travis Howell | 2004-06-23 02:21:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-06-23 02:21:10 +0000 |
| commit | 7d6f56ed48d021a9b13a4a5ffbb274c8eeef3722 (patch) | |
| tree | 7cc61829a8b5fc87ce5a8081b3be581cbce3e9c5 /scumm | |
| parent | 53a0eb87f133e97fc490e857906fb6e2df4a83f3 (diff) | |
| download | scummvm-rg350-7d6f56ed48d021a9b13a4a5ffbb274c8eeef3722.tar.gz scummvm-rg350-7d6f56ed48d021a9b13a4a5ffbb274c8eeef3722.tar.bz2 scummvm-rg350-7d6f56ed48d021a9b13a4a5ffbb274c8eeef3722.zip | |
Enable some sound support in HE7 games.
svn-id: r14006
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v7he.cpp | 3 | ||||
| -rw-r--r-- | scumm/sound.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index f29945759c..bbad4f5746 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -665,7 +665,8 @@ void ScummEngine_v7he::o7_startSound() { break; case 232: - pop(); + //FIXME Ignoring extra arguments for now. + _sound->addSoundToQueue(pop()); // _staticVar4 = pop(); // _staticVar3 = 0; // _staticVar1 = 11025; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 6fe3a99e17..f5c3338d3a 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -941,7 +941,10 @@ File *Sound::openSfxFile() { } if (!file->isOpen()) { - sprintf(buf, "%s.tlk", _vm->getGameName()); + if (_vm->_heversion >= 70) + sprintf(buf, "%s.he2", _vm->getGameName()); + else + sprintf(buf, "%s.tlk", _vm->getGameName()); if (file->open(buf)) file->setEnc(0x69); _soundMode = kVOCMode; |