Ticket #8307: palManipulateInit_new.patch

gfx.cpp

@@ -2916 +2916 @@
         _palManipCounter = time;
 }
 
+void ScummEngine::palManipulateInit_new(int palindex, int start, int end, int time) {
+        byte *pal, *target, *between;
+        const byte *new_pal;
+        int i;
+
+        new_pal = getPalettePtr(palindex);
+
+        new_pal+=start*3;
+
+        _palManipStart = start;
+        _palManipEnd = end;
+        _palManipCounter = 0;
+
+        if (!_palManipPalette)
+                _palManipPalette = (byte *)calloc(0x300, 1);
+        if (!_palManipIntermediatePal)
+                _palManipIntermediatePal = (byte *)calloc(0x600, 1);
+
+        pal = _currentPalette + start * 3;
+        target = _palManipPalette + start * 3;
+        between = _palManipIntermediatePal + start * 6;
+
+        for (i = start; i < end; ++i) {
+                *target++ = *new_pal++;
+                *target++ = *new_pal++;
+                *target++ = *new_pal++;
+                *(uint16 *)between = ((uint16) *pal++) << 8;
+                between += 2;
+                *(uint16 *)between = ((uint16) *pal++) << 8;
+                between += 2;
+                *(uint16 *)between = ((uint16) *pal++) << 8;
+                between += 2;
+        }
+
+        _palManipCounter = time;
+}
+
+
 void ScummEngine::palManipulate() {
         byte *target, *pal, *between;
         int i, j;
@@ -2969 +3007 @@
 }
 
 void ScummEngine::setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor) {
-        const byte *basepal = getPalettePtr();
+        const byte *basepal = getPalettePtr(_curPalIndex);
         const byte *pal = basepal;
         const byte *compareptr;
         byte *table = _shadowPalette;
@@ -3054 +3092 @@
 
         int i, j;
 
-        palPtr = getPalettePtr();
+        palPtr = getPalettePtr(_curPalIndex);
 
         for (i = 0; i < 256; i++)
                 _proc_special_palette[i] = i;
@@ -3103 +3141 @@
                 int j;
                 int color;
 
-                cptr = getPalettePtr() + startColor * 3;
+                cptr = getPalettePtr(_curPalIndex) + startColor * 3;
                 cur = _currentPalette + startColor * 3;
 
                 for (j = startColor; j <= endColor; j++) {
@@ -3163 +3201 @@
                 byte *cur;
                 int j;
 
-                cptr = getPalettePtr() + startColor * 3;
+                cptr = getPalettePtr(_curPalIndex) + startColor * 3;
                 cur = _currentPalette + startColor * 3;
 
                 for (j = startColor; j <= endColor; j++) {
@@ -3330 +3368 @@
         const byte *pals;
 
         _curPalIndex = palindex;
-        pals = getPalettePtr();
+        pals = getPalettePtr(_curPalIndex);
         setPaletteFromPtr(pals);
 }
 
@@ -3354 +3392 @@
         return offs + READ_LE_UINT32(offs + idx * sizeof(uint32));
 }
 
-const byte *ScummEngine::getPalettePtr() {
+const byte *ScummEngine::getPalettePtr(int palindex) {
         const byte *cptr;
 
         cptr = getResourceAddress(rtRoom, _roomResource);
@@ -3362 +3400 @@
         if (_CLUT_offs) {
                 cptr += _CLUT_offs;
         } else {
-                cptr = findPalInPals(cptr + _PALS_offs, _curPalIndex);
+                cptr = findPalInPals(cptr + _PALS_offs, palindex);
         }
         assert(cptr);
         return cptr;

script_v6.cpp

@@ -1589 +1589 @@
                 c = pop();
                 b = pop();
                 a = pop();
-                palManipulateInit(a, b, c, d);
+                palManipulateInit_new(a, b, c, d);
                 break;
 
         case 187:               // SO_CYCLE_SPEED

scumm.h

@@ -827 +827 @@
         void clampCameraPos(Common::Point *pt);
         void actorFollowCamera(int act);
 
-        const byte *getPalettePtr();
+        const byte *getPalettePtr(int palindex);
         void setupAmigaPalette();
         void setupEGAPalette();
         void setupV1ManiacPalette();
@@ -843 +843 @@
         void cyclePalette();
         void stopCycle(int i);
         void palManipulateInit(int start, int end, int string_id, int time);
+        void palManipulateInit_new(int palindex, int start, int end, int time);
         void palManipulate();
 public:
         int remapPaletteColor(int r, int g, int b, uint threshold);             // Used by Actor::remapActorPalette