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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Mon Dec 31 06:59:58 CET 2007


Revision: 30098
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30098&view=rev
Author:   dreammaster
Date:     2007-12-30 21:59:58 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
Added code to handle EGA title screens being immediately shown rather than faded in

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

Modified: scummvm/trunk/engines/lure/intro.cpp
===================================================================
--- scummvm/trunk/engines/lure/intro.cpp	2007-12-31 05:58:22 UTC (rev 30097)
+++ scummvm/trunk/engines/lure/intro.cpp	2007-12-31 05:59:58 UTC (rev 30098)
@@ -23,6 +23,7 @@
  *
  */
 
+#include "lure/lure.h"
 #include "lure/intro.h"
 #include "lure/animseq.h"
 #include "lure/events.h"
@@ -54,15 +55,20 @@
 
 bool Introduction::showScreen(uint16 screenId, uint16 paletteId, uint16 delaySize) {
 	Events &events = Events::getReference();
+	bool isEGA = LureEngine::getReference().isEGA();
 	_screen.screen().loadScreen(screenId);
 	_screen.update();
 	Palette p(paletteId);
-	_screen.paletteFadeIn(&p);
 	
+	if (isEGA) _screen.setPalette(&p);
+	else _screen.paletteFadeIn(&p);
+	
 	bool result = interruptableDelay(delaySize);
 	if (events.quitFlag) return true;
 
-	_screen.paletteFadeOut();
+	if (!isEGA)
+		_screen.paletteFadeOut();
+
 	return result;
 }
 


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