[Scummvm-cvs-logs] SF.net SVN: scummvm:[51173] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Jul 22 23:46:39 CEST 2010


Revision: 51173
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51173&view=rev
Author:   lordhoto
Date:     2010-07-22 21:46:39 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
KYRA: Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.h
    scummvm/trunk/engines/kyra/sequences_lok.cpp

Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h	2010-07-22 21:46:17 UTC (rev 51172)
+++ scummvm/trunk/engines/kyra/kyra_lok.h	2010-07-22 21:46:39 UTC (rev 51173)
@@ -157,6 +157,7 @@
 
 	// -> intro
 	void seq_intro();
+	bool seq_introPublisherLogos();
 	bool seq_introLogos();
 	bool seq_introStory();
 	bool seq_introMalcolmTree();

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2010-07-22 21:46:17 UTC (rev 51172)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2010-07-22 21:46:39 UTC (rev 51173)
@@ -93,6 +93,7 @@
 		_res->loadPakFile("INTRO.VRM");
 
 	static const IntroProc introProcTable[] = {
+		&KyraEngine_LoK::seq_introPublisherLogos,
 		&KyraEngine_LoK::seq_introLogos,
 		&KyraEngine_LoK::seq_introStory,
 		&KyraEngine_LoK::seq_introMalcolmTree,
@@ -132,16 +133,17 @@
 		_res->unloadPakFile("INTRO.VRM");
 }
 
-bool KyraEngine_LoK::seq_introLogos() {
+bool KyraEngine_LoK::seq_introPublisherLogos() {
 	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
 		_screen->loadBitmap("LOGO.CPS", 3, 3, &_screen->getPalette(0));
 		_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0);
 		_screen->updateScreen();
 		_screen->fadeFromBlack();
 		delay(90 * _tickLength);
-		_screen->fadeToBlack();
-		if (!_abortIntroFlag)
+		if (!_abortIntroFlag) {
+			_screen->fadeToBlack();
 			snd_playWanderScoreViaMap(_flags.platform == Common::kPlatformFMTowns ? 57 : 2, 0);
+		}
 	} else if (_flags.platform == Common::kPlatformMacintosh && _res->exists("MP_GOLD.CPS")) {
 		_screen->loadPalette("MP_GOLD.COL", _screen->getPalette(0));
 		_screen->loadBitmap("MP_GOLD.CPS", 3, 3, 0);
@@ -149,12 +151,14 @@
 		_screen->updateScreen();
 		_screen->fadeFromBlack();
 		delay(120 * _tickLength);
-		_screen->fadeToBlack();
+		if (!_abortIntroFlag)
+			_screen->fadeToBlack();
 	}
 
-	if (_abortIntroFlag || shouldQuit())
-		return false;
+	return _abortIntroFlag;
+}
 
+bool KyraEngine_LoK::seq_introLogos() {
 	_screen->clearPage(0);
 
 	if (_flags.platform == Common::kPlatformAmiga) {


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