[Scummvm-git-logs] scummvm master -> 7196d8548643a43ce8b4979a472f1d24c75004de

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7196d85486 SCUMM: DiMUSE: Fix GCC Warnings


Commit: 7196d8548643a43ce8b4979a472f1d24c75004de
    https://github.com/scummvm/scummvm/commit/7196d8548643a43ce8b4979a472f1d24c75004de
Author: D G Turner (digitall at scummvm.org)
Date: 2021-08-14T01:33:45+01:00

Commit Message:
SCUMM: DiMUSE: Fix GCC Warnings

These are due to checking for greater than zero on byte type fields
which are defined using an unsigned type.

Changed paths:
    engines/scumm/imuse_digi/dimuse.cpp
    engines/scumm/imuse_digi/dimuse_track.cpp


diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 2d07e1e83d..8c8213254c 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -445,7 +445,7 @@ void IMuseDigital::callback() {
 						// Just in case the speakingActor is not being set...
 						// This allows for a fallback to pan = 64 (center) and volume = 127 (full)
 						if (track->speakingActor != nullptr) {
-							if (track->speakingActor->_talkVolume >= 0 && track->speakingActor->_talkVolume <= 127)
+							if (track->speakingActor->_talkVolume <= 127)
 								effVol = track->speakingActor->_talkVolume;
 
 							effVol = int(round(effVol * 1.04));
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index e074819ad2..391df09255 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -179,12 +179,12 @@ int IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
 				Actor *a = _vm->derefActor(_vm->_actorToPrintStrFor, "IMuseDigital::startSound");
 				freq = (freq * a->_talkFrequency) / 256;
 
-				if (a->_talkPan >= 0 && a->_talkPan <= 127)
+				if (a->_talkPan <= 127)
 					track->pan = a->_talkPan;
 				else
 					track->pan = 64;
 
-				if (a->_talkVolume >= 0 && a->_talkVolume <= 127)
+				if (a->_talkVolume <= 127)
 					track->vol = a->_talkVolume * 1000;
 				else
 					track->vol = 127 * 1000;