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

[thebluegr at users.sourceforge.net]

Revision: 46512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46512&view=rev
Author:   thebluegr
Date:     2009-12-23 20:13:54 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
SCI/new music code: Song handles are now unique (as SCI0 relies on them, rather than on nodePtr)

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 18:46:10 UTC (rev 46511)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-23 20:13:54 UTC (rev 46512)
@@ -398,7 +398,6 @@
 		cmdInitHandle(obj, value);
 	}
 
-	PUT_SEL32V(_segMan, obj, handle, 0x1234);
 	if (_hasNodePtr) {
 		PUT_SEL32V(_segMan, obj, min, 0);
 		PUT_SEL32V(_segMan, obj, sec, 0);
@@ -407,6 +406,7 @@
 	} else {
 		PUT_SEL32V(_segMan, obj, state, kSndStatusPlaying);
 	}
+
 	_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.