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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Dec 23 17:43:25 CET 2009


Revision: 46505
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46505&view=rev
Author:   thebluegr
Date:     2009-12-23 16:43:24 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
SCI/new music code: Added a sanity check to avoid changing some selectors that don't exist in SCI0

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

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-23 16:33:12 UTC (rev 46504)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-23 16:43:24 UTC (rev 46505)
@@ -408,10 +408,11 @@
 
 	PUT_SEL32V(_segMan, obj, handle, 0x1234);
 	PUT_SEL32V(_segMan, obj, signal, 0);
-	PUT_SEL32V(_segMan, obj, min, 0);
-	PUT_SEL32V(_segMan, obj, sec, 0);
-	PUT_SEL32V(_segMan, obj, frame, 0);
-
+	if (_hasNodePtr) {
+		PUT_SEL32V(_segMan, obj, min, 0);
+		PUT_SEL32V(_segMan, obj, sec, 0);
+		PUT_SEL32V(_segMan, obj, frame, 0);
+	}
 	_music->_playList[slot]->loop = GET_SEL32V(_segMan, obj, loop) == 0xFFFF ? 1 : 0;
 	_music->_playList[slot]->prio = GET_SEL32V(_segMan, obj, priority);
 	_music->_playList[slot]->volume = GET_SEL32V(_segMan, obj, vol);


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




More information about the Scummvm-git-logs mailing list