[Scummvm-cvs-logs] SF.net SVN: scummvm: [29870] scummvm/trunk/engines/lure/animseq.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Dec 16 09:10:47 CET 2007


Revision: 29870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29870&view=rev
Author:   dreammaster
Date:     2007-12-16 00:10:47 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Changed delay method to not break when a modifier key is pressed

Modified Paths:
--------------
    scummvm/trunk/engines/lure/animseq.cpp

Modified: scummvm/trunk/engines/lure/animseq.cpp
===================================================================
--- scummvm/trunk/engines/lure/animseq.cpp	2007-12-16 03:47:24 UTC (rev 29869)
+++ scummvm/trunk/engines/lure/animseq.cpp	2007-12-16 08:10:47 UTC (rev 29870)
@@ -42,7 +42,7 @@
 
 	while (g_system->getMillis() < delayCtr) {
 		while (events.pollEvent()) {
-			if (events.type() == Common::EVENT_KEYDOWN) {
+			if ((events.type() == Common::EVENT_KEYDOWN) && (events.event().kbd.ascii != 0)) {
 				if (events.event().kbd.keycode == Common::KEYCODE_ESCAPE) return ABORT_END_INTRO;
 				else return ABORT_NEXT_SCENE;
 			} else if (events.type() == Common::EVENT_LBUTTONDOWN)
@@ -140,7 +140,9 @@
 	// Loop through displaying the animations
 	while ((_pPixels < _pPixelsEnd) && (_pLines < _pLinesEnd)) {
 		if ((soundFrame != NULL) && (frameCtr == 0))
-			Sound.musicInterface_Play(soundFrame->soundId, soundFrame->channelNum);
+			Sound.musicInterface_Play(
+				Sound.isRoland() ? soundFrame->rolandSoundId : soundFrame->adlibSoundId, 
+				soundFrame->channelNum);
 
 		decodeFrame(_pPixels, _pLines);
 


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




More information about the Scummvm-git-logs mailing list