aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2002-10-22 11:48:24 +0000
committerMax Horn2002-10-22 11:48:24 +0000
commit5151e561d504864a655b25512a933f3bf70bd3de (patch)
tree8a1c9e66bad22700749ee75f07adb39973f90958 /scumm/sound.cpp
parent9f33d561a981203d5d482113b35b329da600ca0e (diff)
downloadscummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.tar.gz
scummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.tar.bz2
scummvm-rg350-5151e561d504864a655b25512a933f3bf70bd3de.zip
fixing various warnings that occur with -Wshadow;some other minor cleanup
svn-id: r5239
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 275f8dd5d3..655166d826 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -482,7 +482,7 @@ int Sound::startTalkSound(uint32 offset, uint32 b, int mode) {
if (mode == 1 && (_scumm->_gameId == GID_TENTACLE
|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
- for (int i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
+ for (i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
if (i != _talkChannel)
_scumm->_mixer->stop(i);
}