Ticket #9049: patchpalette.diff

engines/scumm/scumm.cpp

@@ -494 +494 @@
         case Common::kRenderCGA:
         case Common::kRenderEGA:
         case Common::kRenderAmiga:
-                if ((_game.version >= 4 && !(_game.features & GF_16COLOR)) || (_game.features & GF_OLD256))
+                if ((_game.version >= 4 && !(_game.features & GF_16COLOR) 
+                        && !(_game.platform == Common::kPlatformAmiga && _renderMode == Common::kRenderEGA))
+                        || (_game.features & GF_OLD256))
                         _renderMode = Common::kRenderDefault;
                 break;
 

engines/scumm/scumm.h

@@ -1018 +1018 @@
         void setC64Palette();
         void setNESPalette();
         void setAmigaPalette();
+        void setAmigaMIPalette();
         void setHercPalette();
         void setCGAPalette();
         void setEGAPalette();

engines/scumm/palette.cpp

@@ -70 +70 @@
                         else
                                 setEGAPalette();
                 }
-        } else
+        } else {
+                if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4) {
+                        // if rendermode is set to EGA we use the full palette from the resources
+                        // else we initialise and then lock down the first 16 colors.
+                        if (_renderMode != Common::kRenderEGA)
+                                setAmigaMIPalette();
+                }
                 setDirtyColors(0, 255);
+        }
 }
 
 void ScummEngine::setC64Palette() {
@@ -187 +194 @@
         setPalColor(15, 255, 255, 255);
 }
 
+void ScummEngine::setAmigaMIPalette() {
+        setPalColor( 0,   0,   0,   0);
+        setPalColor( 1,   0,   0, 170);
+        setPalColor( 2,   0, 136,  34);
+        setPalColor( 3,   0, 102, 119);
+        setPalColor( 4, 187, 102, 102);
+        setPalColor( 5, 170,  34, 170);
+        setPalColor( 6, 136,  85,  34);
+        setPalColor( 7, 119, 119, 119);
+        setPalColor( 8,  51,  51,  51);
+        setPalColor( 9,  34,  85, 221);
+        setPalColor(10,  34, 221,  68);
+        setPalColor(11,   0, 204, 255);
+        setPalColor(12, 255, 153, 153);
+        setPalColor(13, 255,  85, 255);
+        setPalColor(14, 255, 255, 119);
+        setPalColor(15, 255, 255, 255);
+}
+
 void ScummEngine::setHercPalette() {
         setPalColor( 0,   0,   0,   0);
 
@@ -258 +284 @@
 }
 
 void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
+        int firstIndex = 0;
         int i;
         byte *dest, r, g, b;
 
@@ -277 +304 @@
 
         dest = _currentPalette;
 
-        for (i = 0; i < numcolor; i++) {
+        if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4 && _renderMode != Common::kRenderEGA) {
+                firstIndex = 16;
+                dest += 3 * 16;
+                ptr += 3 * 16;
+        }
+
+        for (i = firstIndex; i < numcolor; i++) {
                 r = *ptr++;
                 g = *ptr++;
                 b = *ptr++;
@@ -302 +335 @@
                 memcpy(_darkenPalette, _currentPalette, 768);
         }
 
-        setDirtyColors(0, numcolor - 1);
+        setDirtyColors(firstIndex, numcolor - 1);
 }
 
 void ScummEngine::setDirtyColors(int min, int max) {