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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Aug 11 03:24:56 CEST 2009


Revision: 43247
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43247&view=rev
Author:   lordhoto
Date:     2009-08-11 01:24:56 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Some changes to get the Kyrandia 1 Amiga credits to show up at least.

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

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 01:24:40 UTC (rev 43246)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 01:24:56 UTC (rev 43247)
@@ -1021,11 +1021,13 @@
 	if (_flags.platform == Common::kPlatformAmiga) {
 		_screen->loadBitmap("GEMCUT.CPS", 3, 3, &_screen->getPalette(0));
 		_screen->copyRegion(232, 136, 176, 56, 56, 56, 2, 2);
+		_screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0);
+		_screen->copyRegion(0, 0, 0, 0, 320, 200, 0, 2, Screen::CR_NO_P_CHECK);
 	} else {
 		_screen->loadBitmap("REUNION.CPS", 3, 3, &_screen->getPalette(0));
+		_screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0);
 	}
 
-	_screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0);
 	_screen->_curPage = 0;
 	// XXX
 	assert(_homeString);
@@ -1058,8 +1060,10 @@
 
 	memset(strings, 0, sizeof(strings));
 
+	_screen->enableInterfacePalette(false);
+
 	_screen->hideMouse();
-	if (!_flags.isTalkie) {
+	if (!_flags.isTalkie && _flags.platform != Common::kPlatformAmiga) {
 		_screen->loadFont(Screen::FID_CRED6_FNT, "CREDIT6.FNT");
 		_screen->loadFont(Screen::FID_CRED8_FNT, "CREDIT8.FNT");
 	} else
@@ -1079,7 +1083,8 @@
 	uint8 *buffer = 0;
 	uint32 size = 0;
 
-	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
+	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98
+			|| _flags.platform == Common::kPlatformAmiga) {
 		int sizeTmp = 0;
 		const uint8 *bufferTmp = _staticres->loadRawData(k1CreditsStrings, sizeTmp);
 		buffer = new uint8[sizeTmp];
@@ -1117,12 +1122,12 @@
 
 		if (*currentString == 1) {
 			currentString++;
-			if (!_flags.isTalkie)
+			if (!_flags.isTalkie && _flags.platform != Common::kPlatformAmiga)
 				_screen->setFont(Screen::FID_CRED6_FNT);
 		} else {
 			if (*currentString == 2)
 				currentString++;
-			if (!_flags.isTalkie)
+			if (!_flags.isTalkie && _flags.platform != Common::kPlatformAmiga)
 				_screen->setFont(Screen::FID_CRED8_FNT);
 		}
 		strings[i].font = _screen->_currentFont;
@@ -1145,6 +1150,9 @@
 
 	_screen->getPalette(2).clear();
 	_screen->setScreenPalette(_screen->getPalette(2));
+	if (_flags.platform == Common::kPlatformAmiga)
+		_screen->setPaletteIndex(16, 63, 63, 63);
+
 	_screen->copyRegion(8, 32, 8, 32, 312, 128, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->fadePalette(_screen->getPalette(0), 0x5A);
 


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