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

[lordhoto at users.sourceforge.net]

Revision: 33522
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33522&view=rev
Author:   lordhoto
Date:     2008-08-02 14:32:05 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Fixed regressions in kyra1 amiga.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-08-02 13:30:04 UTC (rev 33521)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-08-02 14:32:05 UTC (rev 33522)
@@ -413,7 +413,9 @@
 void Screen::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff) {
 	debugC(9, kDebugLevelScreen, "Screen::getFadeParams(%p, %d, %p, %p)", (const void *)palette, delay, (const void *)&delayInc, (const void *)&diff);
 	uint8 maxDiff = 0;
-	for (int i = 0; i < 768; ++i) {
+
+	const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256) * 3;
+	for (int i = 0; i < colors; ++i) {
 		diff = ABS(palette[i] - _screenPalette[i]);
 		maxDiff = MAX<uint8>(maxDiff, diff);
 	}
@@ -438,7 +440,8 @@
 	memcpy(fadePal, _screenPalette, 768);
 	
 	bool needRefresh = false;
-	for (int i = 0; i < 768; ++i) {
+	const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256) * 3;
+	for (int i = 0; i < colors; ++i) {
 		int c1 = palette[i];
 		int c2 = fadePal[i];
 		if (c1 != c2) {
@@ -476,7 +479,7 @@
 void Screen::setScreenPalette(const uint8 *palData) {
 	debugC(9, kDebugLevelScreen, "Screen::setScreenPalette(%p)", (const void *)palData);
 
-	int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256);
+	const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256);
 	if (palData != _screenPalette)
 		memcpy(_screenPalette, palData, colors*3);
 

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-08-02 13:30:04 UTC (rev 33521)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-08-02 14:32:05 UTC (rev 33522)
@@ -1068,7 +1068,8 @@
 		_soundData = soundData_TOWNS;
 	else if (_flags.platform == Common::kPlatformPC98)
 		_soundData = soundData_TOWNS/*soundData_PC98*/;
-
+	else
+		_soundData = 0;
 }
 
 void KyraEngine_LoK::loadMouseShapes() {


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