aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-29 19:50:48 -0500
committerPaul Gilbert2017-01-29 19:50:48 -0500
commitfd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6 (patch)
tree84236000d569a10d15825d9500773115e5a4ab5d
parent6af5b08014e6573ccb9735ce3e4e2da2c141c857 (diff)
downloadscummvm-rg350-fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6.tar.gz
scummvm-rg350-fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6.tar.bz2
scummvm-rg350-fd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6.zip
TITANIC: Remove incorrect range checks on bool fields
-rw-r--r--engines/titanic/sound/music_room_handler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index 78c5e37e09..d9e2eeb72e 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;
}