[Scummvm-git-logs] scummvm master -> fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6

[dreammaster]

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:
fd69ac2943 TITANIC: Remove incorrect range checks on bool fields


Commit: fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6
    https://github.com/scummvm/scummvm/commit/fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-29T19:50:48-05:00

Commit Message:
TITANIC: Remove incorrect range checks on bool fields

Changed paths:
    engines/titanic/sound/music_room_handler.cpp


diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index 78c5e37..d9e2eeb 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -104,12 +104,12 @@ void CMusicRoomHandler::setPitchControl2(MusicInstrument instrument, int value)
 }
 
 void CMusicRoomHandler::setInversionControl2(MusicInstrument instrument, bool value) {
-	if (instrument >= BELLS && instrument <= BASS && value >= -2 && value <= 2)
+	if (instrument >= BELLS && instrument <= BASS)
 		_array2[instrument]._inversionControl = value;
 }
 
 void CMusicRoomHandler::setDirectionControl2(MusicInstrument instrument, bool value) {
-	if (instrument >= BELLS && instrument <= BASS && value >= -2 && value <= 2)
+	if (instrument >= BELLS && instrument <= BASS)
 		_array2[instrument]._directionControl = value;
 }
 
@@ -124,17 +124,17 @@ void CMusicRoomHandler::setSpeedControl(MusicInstrument instrument, int value) {
 }
 
 void CMusicRoomHandler::setDirectionControl(MusicInstrument instrument, bool value) {
-	if (instrument >= BELLS && instrument <= BASS && value >= -2 && value <= 2)
+	if (instrument >= BELLS && instrument <= BASS)
 		_array1[instrument]._directionControl = value;
 }
 
 void CMusicRoomHandler::setInversionControl(MusicInstrument instrument, bool value) {
-	if (instrument >= BELLS && instrument <= BASS && value >= -2 && value <= 2)
+	if (instrument >= BELLS && instrument <= BASS)
 		_array1[instrument]._inversionControl = value;
 }
 
 void CMusicRoomHandler::setMuteControl(MusicInstrument instrument, bool value) {
-	if (instrument >= BELLS && instrument <= BASS && value >= -2 && value <= 2)
+	if (instrument >= BELLS && instrument <= BASS)
 		_array1[instrument]._muteControl = value;
 }