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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Aug 10 01:23:49 CEST 2009


Revision: 43188
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43188&view=rev
Author:   lordhoto
Date:     2009-08-09 23:23:48 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
Unbreak basic Kyra1 amiga in game support, by disabling some palette code for the amiga version.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lok.cpp
    scummvm/trunk/engines/kyra/text_lok.cpp

Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp	2009-08-09 22:46:43 UTC (rev 43187)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp	2009-08-09 23:23:48 UTC (rev 43188)
@@ -449,7 +449,8 @@
 		return 0;
 	}
 	// XXX
-	_screen->setPaletteIndex(0xFE, 60, 60, 0);
+	if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+		_screen->setPaletteIndex(0xFE, 60, 60, 0);
 	for (int i = 0; i < 6; i++) {
 		_menuButtonData[i].data0Val1 = _menuButtonData[i].data1Val1 = _menuButtonData[i].data2Val1 = 4;
 		_menuButtonData[i].data0Callback = _redrawShadedButtonFunctor;

Modified: scummvm/trunk/engines/kyra/text_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lok.cpp	2009-08-09 22:46:43 UTC (rev 43187)
+++ scummvm/trunk/engines/kyra/text_lok.cpp	2009-08-09 23:23:48 UTC (rev 43188)
@@ -324,7 +324,8 @@
 	_screen->hideMouse();
 	_screen->fillRect(8, 143, 311, 152, 12);
 
-	if (_startSentencePalIndex != color || _fadeText != false) {
+	// TODO: Amiga support
+	if ((_startSentencePalIndex != color || _fadeText != false) && _flags.platform != Common::kPlatformAmiga) {
 		_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color*3];
 		_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color*3+1];
 		_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color*3+2];


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