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

[thebluegr at users.sourceforge.net]

Revision: 46973
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46973&view=rev
Author:   thebluegr
Date:     2010-01-04 16:16:58 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
SCI/new sound code: update sound cues when kGetEvent() is called, instead of kAnimate(), fixes music fading in LSL3

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kevent.cpp
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp	2010-01-04 15:17:46 UTC (rev 46972)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp	2010-01-04 16:16:58 UTC (rev 46973)
@@ -141,6 +141,17 @@
 		con->onFrame();
 	}
 
+#ifndef USE_OLD_MUSIC_FUNCTIONS
+	if (s->detectDoSoundType() <= SCI_VERSION_0_LATE) {
+		// If we're running a SCI0 game, update the sound cues, to compensate
+		// for the fact that SCI0 does not poll to update the sound cues itself,
+		// like SCI01 and later do with cmdUpdateSoundCues. kAnimate is called
+		// quite often, so emulate the SCI01 behavior of cmdUpdateSoundCues with
+		// this call
+		s->_soundCmd->updateSci0Cues();
+	}
+#endif
+
 	return s->r_acc;
 }
 

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-04 15:17:46 UTC (rev 46972)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-04 16:16:58 UTC (rev 46973)
@@ -962,15 +962,6 @@
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	// Take care of incoming events (kAnimate is called semi-regularly)
 	process_sound_events(s);
-#else
-	if (s->detectDoSoundType() <= SCI_VERSION_0_LATE) {
-		// If we're running a SCI0 game, update the sound cues, to compensate
-		// for the fact that SCI0 does not poll to update the sound cues itself,
-		// like SCI01 and later do with cmdUpdateSoundCues. kAnimate is called
-		// quite often, so emulate the SCI01 behavior of cmdUpdateSoundCues with
-		// this call
-		s->_soundCmd->updateSci0Cues();
-	}
 #endif
 
 	s->_gui->animate(castListReference, cycle, argc, argv);


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