Ticket #4870: bomp_fix.patch

engines/scumm/akos.cpp

@@ -1065 +1065 @@
         bdd.shadowMode = _shadow_mode;
         bdd.shadowPalette = _vm->_shadowPalette;
 
-        bdd.actorPalette = 0;
-        if (_useBompPalette) {
-                for (uint i = 0; i < 256; i++)
-                        bdd.actorPalette[i] = _palette[i];
-        }
+        bdd.actorPalette = _useBompPalette ? _palette : 0;
 
         bdd.mirror = !_mirror;
 

engines/scumm/bomp.cpp

@@ -38 +38 @@
 static void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, bool HE7Check);
 static void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
 static void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
-static void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size);
+static void bompApplyActorPalette(uint16 *actorPalette, byte *line_buffer, int32 size);
 
 
 
@@ -172 +172 @@
         }
 }
 
-void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size) {
+void bompApplyActorPalette(uint16 *actorPalette, byte *line_buffer, int32 size) {
         actorPalette[255] = 255;
         while (size-- > 0) {
                 *line_buffer = actorPalette[*line_buffer];

engines/scumm/bomp.h

@@ -54 +54 @@
         uint16 shadowMode;
         byte *shadowPalette;
 
-        byte *actorPalette;
+        uint16 *actorPalette;
 
         bool mirror;
 };