[Scummvm-cvs-logs] SF.net SVN: scummvm:[43116] scummvm/branches/gsoc2009-mods

[nolange at users.sourceforge.net]

Revision: 43116
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43116&view=rev
Author:   nolange
Date:     2009-08-08 09:49:28 +0000 (Sat, 08 Aug 2009)

Log Message:
-----------
fix a bug that prevented gcc from compiling
correctly added my palette patch (it showed up in the rev-changes but dint got applied fully to the svn tree?)

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h

Modified: scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp	2009-08-08 09:38:45 UTC (rev 43115)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp	2009-08-08 09:49:28 UTC (rev 43116)
@@ -201,8 +201,13 @@
 	assertRange(0, numcolor, 256, "setPaletteFromPtr: numcolor");
 
 	dest = _currentPalette;
+	if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4 && _renderMode != Common::kRenderEGA) {
+		firstIndex = 16;
+		dest += 3 * 16;
+		ptr += 3 * 16;
+	}
 
-	for (i = 0; i < numcolor; i++) {
+	for (i = firstIndex; i < numcolor; i++) {
 		r = *ptr++;
 		g = *ptr++;
 		b = *ptr++;
@@ -227,7 +232,7 @@
 		memcpy(_darkenPalette, _currentPalette, 768);
 	}
 
-	setDirtyColors(0, numcolor - 1);
+	setDirtyColors(firstIndex, numcolor - 1);
 }
 
 void ScummEngine::setDirtyColors(int min, int max) {

Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h	2009-08-08 09:38:45 UTC (rev 43115)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h	2009-08-08 09:49:28 UTC (rev 43116)
@@ -205,7 +205,7 @@
 		int32	stopEventTime;
 	} _voiceCtx[kNumVoices];
 
-	void MaxTrax::controlCh(ChannelContext &channel, byte command, byte data);
+	void controlCh(ChannelContext &channel, byte command, byte data);
 	void freePatches();
 	void freeScores();
 	void resetChannel(ChannelContext &chan, bool rightChannel);


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