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

[m_kiewitz at users.sourceforge.net]

Revision: 48915
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48915&view=rev
Author:   m_kiewitz
Date:     2010-05-03 16:47:09 +0000 (Mon, 03 May 2010)

Log Message:
-----------
SCI: reverting r48805 - caused regression in sq3new/kq1

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

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-03 16:45:41 UTC (rev 48914)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-03 16:47:09 UTC (rev 48915)
@@ -517,9 +517,8 @@
 		PUT_SEL32V(_segMan, obj, SELECTOR(state), kSoundStopped);
 	} else {
 		PUT_SEL32V(_segMan, obj, SELECTOR(handle), 0);
+		PUT_SEL32V(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 	}
-	// we need to set signal selector as well for SCI0 at least for sq3old, otherwise freeing the 2 guys wont work (endless loop)
-	PUT_SEL32V(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 
 	musicSlot->dataInc = 0;
 	musicSlot->signal = 0;


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