[Scummvm-cvs-logs] SF.net SVN: scummvm:[46482] scummvm/trunk/engines/sci/sfx

[thebluegr at users.sourceforge.net]

Revision: 46482
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46482&view=rev
Author:   thebluegr
Date:     2009-12-22 13:31:52 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Silenced some warnings to protect DrMcCoy from incoming Borg

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-22 12:35:48 UTC (rev 46481)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-22 13:31:52 UTC (rev 46482)
@@ -640,7 +640,7 @@
 			info.ext.data = _position._play_pos;
 			_position._play_pos += info.length;
 			if (info.ext.type == 0x2F) {// end of track reached
-				int16 loop = GET_SEL32V(_segMan, _pSnd->soundObj, loop);
+				uint16 loop = GET_SEL32V(_segMan, _pSnd->soundObj, loop);
 				if (loop == 0xFFFF) {
 					jumpToTick(_loopTick);
 					PUT_SEL32V(_segMan, _pSnd->soundObj, loop, loop--);

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-22 12:35:48 UTC (rev 46481)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-22 13:31:52 UTC (rev 46482)
@@ -689,7 +689,7 @@
 	}
 
 	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 @@
 		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::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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.