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

[m_kiewitz at users.sourceforge.net]

Revision: 46553
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46553&view=rev
Author:   m_kiewitz
Date:     2009-12-25 13:52:40 +0000 (Fri, 25 Dec 2009)

Log Message:
-----------
SCI/newmusic: find slot again after destroying it fixes kq6cd, lb2cd, added debug output

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-25 13:37:55 UTC (rev 46552)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-25 13:52:40 UTC (rev 46553)
@@ -399,6 +399,8 @@
 	if (_music->_playList[slot]->resnum != number) { // another sound loaded into struct
 		cmdDisposeHandle(obj, value);
 		cmdInitHandle(obj, value);
+		// Find slot again :)
+		slot = _music->findListSlot(obj);
 	}
 
 	if (_hasNodePtr) {
@@ -686,6 +688,7 @@
 	case SI_ABSOLUTE_CUE:
 		debugC(2, kDebugLevelSound, "---    [CUE] %04x:%04x Absolute Cue: %d\n",
 		          PRINT_REG(obj), signal);
+		printf("abs-signal %04X\n", signal);
 		PUT_SEL32V(_segMan, obj, signal, signal);
 		break;
 
@@ -697,6 +700,7 @@
 		 * below, with proper storage of dataInc and
 		 * signal in the iterator code. */
 		PUT_SEL32V(_segMan, obj, dataInc, signal);
+		printf("rel-signal %04X\n", signal);
 		if (_soundVersion == SCI_VERSION_1_EARLY)
 			PUT_SEL32V(_segMan, obj, signal, signal);
 		else


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