aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bacca2004-01-17 11:16:38 +0000
committerNicolas Bacca2004-01-17 11:16:38 +0000
commit21eff1eef2e7a56c1a54b566423f64ee37bda53f (patch)
tree15ae6a6c369fa5a6e05b0cd00398c679846db29f
parent051d5fe2d84523b7880ac1f68c778595aa67ed04 (diff)
downloadscummvm-rg350-21eff1eef2e7a56c1a54b566423f64ee37bda53f.tar.gz
scummvm-rg350-21eff1eef2e7a56c1a54b566423f64ee37bda53f.tar.bz2
scummvm-rg350-21eff1eef2e7a56c1a54b566423f64ee37bda53f.zip
And again ... guess who fails compiling this ?
svn-id: r12453
-rw-r--r--sword1/sound.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sword1/sound.cpp b/sword1/sound.cpp
index 8d496016a2..c81362addb 100644
--- a/sword1/sound.cpp
+++ b/sword1/sound.cpp
@@ -219,7 +219,8 @@ int16 *Sound::uncompressSpeech(uint32 index, uint32 cSize, uint32 *size) {
void Sound::calcWaveVolume(int16 *data, uint32 length) {
int16 *blkPos = data + 918;
- for (uint32 cnt = 0; cnt < WAVE_VOL_TAB_LENGTH; cnt++)
+ uint32 cnt;
+ for (cnt = 0; cnt < WAVE_VOL_TAB_LENGTH; cnt++)
_waveVolume[cnt] = false;
_waveVolPos = 0;
for (uint32 blkCnt = 1; blkCnt < length / 918; blkCnt++) {
@@ -228,11 +229,11 @@ void Sound::calcWaveVolume(int16 *data, uint32 length) {
return;
}
int32 average = 0;
- for (uint32 cnt = 0; cnt < 918; cnt++)
+ for (cnt = 0; cnt < 918; cnt++)
average += blkPos[cnt];
average /= 918;
uint32 diff = 0;
- for (uint32 cnt = 0; cnt < 918; cnt++) {
+ for (cnt = 0; cnt < 918; cnt++) {
int16 smpDiff = *blkPos - average;
diff += (uint32)ABS(smpDiff);
blkPos++;