aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/soundcmd.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-22 13:31:52 +0000
committerFilippos Karapetis2009-12-22 13:31:52 +0000
commitebd11a056f61d6b32c5323ab0cefbc3d9c28f480 (patch)
tree93a5c8d11b98bf9618cd9fda0897946def400067 /engines/sci/sfx/soundcmd.cpp
parent86dc69430b0286d4a90aa3390b59639dcb56291b (diff)
downloadscummvm-rg350-ebd11a056f61d6b32c5323ab0cefbc3d9c28f480.tar.gz
scummvm-rg350-ebd11a056f61d6b32c5323ab0cefbc3d9c28f480.tar.bz2
scummvm-rg350-ebd11a056f61d6b32c5323ab0cefbc3d9c28f480.zip
Silenced some warnings to protect DrMcCoy from incoming Borg
svn-id: r46482
Diffstat (limited to 'engines/sci/sfx/soundcmd.cpp')
-rw-r--r--engines/sci/sfx/soundcmd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index 9afeed5340..edb6b7bc44 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -689,7 +689,7 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
}
if (!GET_SEL32(_segMan, obj, nodePtr).isNull()) {
- int16 signal = GET_SEL32V(_segMan, obj, signal);
+ uint16 signal = GET_SEL32V(_segMan, obj, signal);
int16 dataInc = GET_SEL32V(_segMan, obj, dataInc);
switch (signal) {
@@ -767,7 +767,7 @@ void SoundCommandParser::cmdSetHandlePriority(reg_t obj, int16 value) {
return;
}
- if (value == 0xFFFF) {
+ if (value == -1) {
//pSnd->prio=0;field_15B=0
PUT_SEL32V(_segMan, obj, flags, GET_SEL32V(_segMan, obj, flags) & 0xFD);
} else {
@@ -780,7 +780,7 @@ void SoundCommandParser::cmdSetHandlePriority(reg_t obj, int16 value) {
void SoundCommandParser::cmdSetHandleLoop(reg_t obj, int16 value) {
if (!GET_SEL32(_segMan, obj, nodePtr).isNull()) {
- PUT_SEL32V(_segMan, obj, loop, value == 0xFFFF ? 0xFFFF : 1);
+ PUT_SEL32V(_segMan, obj, loop, value == -1 ? 0xFFFF : 1);
#ifdef USE_OLD_MUSIC_FUNCTIONS
SongHandle handle = FROBNICATE_HANDLE(obj);
_state->sfx_song_set_loops(handle, value);