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

[m_kiewitz at users.sourceforge.net]

Revision: 46730
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46730&view=rev
Author:   m_kiewitz
Date:     2009-12-29 23:25:24 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
SCI/newmusic: fixed fading (fixes gk1 demo, park area)

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-29 23:23:31 UTC (rev 46729)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-29 23:25:24 UTC (rev 46730)
@@ -378,6 +378,8 @@
 			volume = fadeTo;
 			fadeStep = 0;
 		}
+		SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;	// HACK
+		PUT_SEL32V(segMan, soundObj, vol, volume);
 
 		pMidiParser->setVolume(volume);
 	}

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-29 23:23:31 UTC (rev 46729)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-29 23:25:24 UTC (rev 46730)
@@ -640,11 +640,14 @@
 		return;
 	}
 
-	int volume = GET_SEL32V(_segMan, obj, vol);
+	int volume = musicSlot->volume;
+	PUT_SEL32V(_segMan, musicSlot->soundObj, vol, volume);
 	musicSlot->fadeTo = _argv[2].toUint16();
 	musicSlot->fadeStep = volume > _argv[2].toUint16() ? -_argv[4].toUint16() : _argv[4].toUint16();
 	musicSlot->fadeTickerStep = _argv[3].toUint16() * 16667 / _music->soundGetTempo();
 	musicSlot->fadeTicker = 0;
+
+	debugC(2, kDebugLevelSound, "cmdFadeHandle: to %d, step %d, ticker %d", musicSlot->fadeTo, musicSlot->fadeStep, musicSlot->fadeTickerStep);
 #endif
 }
 


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