diff options
| author | Sven Hesse | 2007-04-15 16:26:12 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-04-15 16:26:12 +0000 |
| commit | c8396a283df5f56b6945d6b569a3a5ea6d10ac78 (patch) | |
| tree | 1c17e3af5b633afcb2587c15dfb81b600d1edc5a | |
| parent | 2c3e9e087f94bd4f2d121dc61b80ad28c0ee163b (diff) | |
| download | scummvm-rg350-c8396a283df5f56b6945d6b569a3a5ea6d10ac78.tar.gz scummvm-rg350-c8396a283df5f56b6945d6b569a3a5ea6d10ac78.tar.bz2 scummvm-rg350-c8396a283df5f56b6945d6b569a3a5ea6d10ac78.zip | |
Fixing compile for me, hopefully not breaking it for the MSVC8 again...
svn-id: r26508
| -rw-r--r-- | engines/gob/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp index b390510768..4e0516722b 100644 --- a/engines/gob/sound.cpp +++ b/engines/gob/sound.cpp @@ -235,7 +235,7 @@ void Snd::stopSound(int16 fadeLength, SoundDesc *sndDesc) { _fade = true; _fadeVol = 65536; _fadeSamples = (int) (fadeLength * (((double) _rate) / 10.0)); - _fadeVolStep = MAX(1UL, 65536 / _fadeSamples); + _fadeVolStep = MAX((int32) 1, (int32) (65536 / _fadeSamples)); _curFadeSamples = 0; } @@ -341,7 +341,7 @@ void Snd::setSample(SoundDesc &sndDesc, int16 repCount, int16 frequency, _fade = true; _fadeVol = 0; _fadeSamples = (int) (fadeLength * (((double) _rate) / 10.0)); - _fadeVolStep = - (int32)MAX(1UL, 65536 / _fadeSamples); + _fadeVolStep = - MAX((int32) 1, (int32) (65536 / _fadeSamples)); } } |