aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-05-12 19:53:18 +0000
committerMax Horn2003-05-12 19:53:18 +0000
commitb43ea06a8041b55553f28f5b44166d820c31ab5d (patch)
treef4464cdb2a4080818a9192fb1d00cd18309dd4fc /scumm
parentd5a906928545544b47897143fbb7ad0d344fe339 (diff)
downloadscummvm-rg350-b43ea06a8041b55553f28f5b44166d820c31ab5d.tar.gz
scummvm-rg350-b43ea06a8041b55553f28f5b44166d820c31ab5d.tar.bz2
scummvm-rg350-b43ea06a8041b55553f28f5b44166d820c31ab5d.zip
fixed illegal var access in V7/V8 games
svn-id: r7475
Diffstat (limited to 'scumm')
-rw-r--r--scumm/sound.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index f087e1a346..60e549bbe8 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -101,15 +101,14 @@ void Sound::processSoundQues() {
);
#endif
- if (!(_scumm->_features & GF_AFTER_V7)) {
- if (_scumm->_imuse)
- _scumm->VAR(_scumm->VAR_SOUNDRESULT) =
- (short)_scumm->_imuse->doCommand(data[0], data[1], data[2], data[3], data[4],
+ if (_scumm->_features & GF_AFTER_V7) {
+ if (_scumm->_imuseDigital)
+ _scumm->_imuseDigital->doCommand(data[0], data[1], data[2], data[3], data[4],
data[5], data[6], data[7]);
} else {
- if (_scumm->_imuseDigital)
+ if (_scumm->_imuse)
_scumm->VAR(_scumm->VAR_SOUNDRESULT) =
- (short)_scumm->_imuseDigital->doCommand(data[0], data[1], data[2], data[3], data[4],
+ (short)_scumm->_imuse->doCommand(data[0], data[1], data[2], data[3], data[4],
data[5], data[6], data[7]);
}
}