diff options
| author | Sven Hesse | 2007-01-26 19:00:41 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-01-26 19:00:41 +0000 |
| commit | 8e6cd813337ca4ec7ba5124b361583219c151b90 (patch) | |
| tree | 2b4c64b4a18a5f7161434288293e9f45ecd9501a /engines/gob/inter_v2.cpp | |
| parent | d2910fe758ef7dac8657a3a9faa85383a6cf0e9a (diff) | |
| download | scummvm-rg350-8e6cd813337ca4ec7ba5124b361583219c151b90.tar.gz scummvm-rg350-8e6cd813337ca4ec7ba5124b361583219c151b90.tar.bz2 scummvm-rg350-8e6cd813337ca4ec7ba5124b361583219c151b90.zip | |
- Just warn, don't die, when a CD-Track isn't found
- Before using _vm->_adlib, first check whether it's actually there
svn-id: r25205
Diffstat (limited to 'engines/gob/inter_v2.cpp')
| -rw-r--r-- | engines/gob/inter_v2.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index f134d91fa6..fd21e6e12f 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -1601,10 +1601,12 @@ bool Inter_v2::o2_playSound(char &cmdCount, int16 &counter, int16 &retFlag) { _vm->_game->_soundSamples[index]->size / 2) * 1000) / freq2; } // loc_E2F3 - if (_vm->_game->_soundTypes[index] & 8) { - _vm->_adlib->load((byte *) _vm->_game->_soundSamples[index], index); - _vm->_adlib->setRepeating(repCount - 1); - _vm->_adlib->startPlay(); + if ((_vm->_game->_soundTypes[index] & 8)) { + if (_vm->_adlib) { + _vm->_adlib->load((byte *) _vm->_game->_soundSamples[index], index); + _vm->_adlib->setRepeating(repCount - 1); + _vm->_adlib->startPlay(); + } } else { _vm->_snd->stopSound(0); _vm->_snd->playSample(_vm->_game->_soundSamples[index], repCount, frequency); |