[Scummvm-git-logs] scummvm master -> 32d72c70f8c198b4d3a607ae1104078c9fb59609
orgads
noreply at scummvm.org
Wed May 14 19:56:11 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
32d72c70f8 GRIM: Fix unused variable warning
Commit: 32d72c70f8c198b4d3a607ae1104078c9fb59609
https://github.com/scummvm/scummvm/commit/32d72c70f8c198b4d3a607ae1104078c9fb59609
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-05-14T22:56:07+03:00
Commit Message:
GRIM: Fix unused variable warning
Changed paths:
engines/grim/imuse/imuse_track.cpp
diff --git a/engines/grim/imuse/imuse_track.cpp b/engines/grim/imuse/imuse_track.cpp
index 069fea83011..5d83fd1a313 100644
--- a/engines/grim/imuse/imuse_track.cpp
+++ b/engines/grim/imuse/imuse_track.cpp
@@ -133,7 +133,6 @@ bool Imuse::startSound(const char *soundName, int volGroupId, int hookId, int vo
track->curRegion = -1;
track->trackId = l;
- int bits = 0, freq = 0, channels = 0;
Common::strcpy_s(track->soundName, soundName);
track->soundDesc = _sound->openSound(soundName, volGroupId);
@@ -141,13 +140,14 @@ bool Imuse::startSound(const char *soundName, int volGroupId, int hookId, int vo
if (!track->soundDesc)
return false;
- bits = _sound->getBits(track->soundDesc);
- channels = _sound->getChannels(track->soundDesc);
- freq = _sound->getFreq(track->soundDesc);
+ const int bits = _sound->getBits(track->soundDesc);
+ const int channels = _sound->getChannels(track->soundDesc);
+ const int freq = _sound->getFreq(track->soundDesc);
assert(bits == 8 || bits == 12 || bits == 16);
assert(channels == 1 || channels == 2);
assert(0 < freq && freq <= 65535);
+ (void)bits;
track->feedSize = freq * channels * 2;
track->mixerFlags = kFlag16Bits;
More information about the Scummvm-git-logs
mailing list