Ticket #8619: agipal.2.diff

graphics.cpp

@@ -22 +22 @@
  *
  */
 
+#include "common/file.h"
 #include "common/stdafx.h"
 
 #include "graphics/cursorman.h"
@@ -375 +376 @@
         g_system->setPalette(pal, 0, 32);
 }
 
+//Gets AGIPAL Data
+void GfxMgr::setAGIPal(int p0) {
+        //report("Using AGIPAL hack\n");
+        Common::File agipal;
+
+        char filename[15];
+        uint32 fileSize;
+        sprintf(filename, "pal.%d", p0);
+        agipal.open(filename);
+        fileSize = agipal.size();
+        byte *palData = (byte *)malloc(fileSize);
+        agipal.read(palData, fileSize);
+        agipal.close();
+
+        //Chunk0 holds colors 0-7
+        for (int i = 0; i <= 23; i++)
+                _agipalPalette[i] = palData[i];
+        
+        //Chunk1 is the same as the chunk0
+        //Chunk2 chunk holds colors 8-15
+        for (int i = 24; i <= 71; i++)
+                _agipalPalette[i] = palData[i+24];
+
+        //Chunk3 is the same as the chunk2
+        //Chunks4-7 are duplicates of chunks0-3
+
+        _useAGIPal = 1;
+        deinitVideo();
+        initVideo();
+        free(palData);
+        palData = 0;
+        for (int j=0; j<48; j++)
+                _agipalPalette[j]=0;
+}
+
 /* put a block onto the screen */
 void GfxMgr::gfxPutBlock(int x1, int y1, int x2, int y2) {
         if (x1 >= GFX_WIDTH)
@@ -407 +443 @@
  * @see deinit_video()
  */
 int GfxMgr::initVideo() {
-        if (_vm->_renderMode == Common::kRenderEGA)
-                initPalette(egaPalette);
-        else
-                initPalette(newPalette);
+        if (_useAGIPal) {
+                initPalette(_agipalPalette);
+                _useAGIPal = 0;
+        } else
+                if (_vm->_renderMode == Common::kRenderEGA)
+                        initPalette(egaPalette);
+                else
+                        initPalette(newPalette);
 
         if ((_agiScreen = (uint8 *)calloc(GFX_WIDTH, GFX_HEIGHT)) == NULL)
                 return errNotEnoughMemory;

graphics.h

@@ -46 +46 @@
 
         uint8 *_shakeH, *_shakeV;
 
+        bool _useAGIPal;
+        uint8 _agipalPalette[16 * 3];
+
 public:
         GfxMgr(AgiEngine *vm) {
                 _vm = vm;
                 _shakeH = NULL;
                 _shakeV = NULL;
+                _useAGIPal = 0;
         }
 
         void gfxPutBlock(int x1, int y1, int x2, int y2);
@@ -80 +84 @@
         void saveBlock(int, int, int, int, uint8 *);
         void restoreBlock(int, int, int, int, uint8 *);
         void initPalette(uint8 *);
+        void setAGIPal(int);
         void drawFrame(int x1, int y1, int x2, int y2, int c1, int c2);
 
         void putPixel(int, int, int);

op_cmd.cpp

@@ -1231 +1231 @@
          * set the palette.
          */
         if ((g_agi->getFeatures() & GF_AGIPAL) && p0 >= 100 && p0 < 110) {
-                report("not implemented: AGIPAL palettes\n");
+                g_gfx->setAGIPal(p0);
                 return;
         } else
                 g_gfx->shakeStart();