- Arreglos per a que les fonts funcionen amb la nova paleta

resources/paleta_final.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-61
+128
 255 0 255
 0 0 252
 120 56 0
@@ -62,3 +62,70 @@ JASC-PAL
 0 192 0
 0 128 0
 255 255 0
+255 255 255
+0 0 0
+0 0 0
+212 172 40
+196 132 8
+172 104 0
+148 80 0
+212 172 40
+196 132 8
+172 104 0
+148 80 0
+252 0 0
+132 0 0
+252 132 132
+252 196 196
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

source/gamestate_postfase.cpp

@@ -112,6 +112,7 @@ namespace gamestate
                 salir = true;
                 return true;
             }
+            return true;
         }
 
         void drawText(const int x, const int y, const uint8_t color, std::string text)
@@ -119,13 +120,12 @@ namespace gamestate
             draw::surface *pic = draw::loadSurface("fuente2.gif");
             draw::setSource(pic);
             draw::setTrans(0);
-            draw::setPaletteEntry(64, 255, 255, 255);
-            draw::setPaletteEntry(65, 255, 0, 0);
-            draw::setPaletteEntry(66, 0, 255, 0);
-            draw::setPaletteEntry(67, 0, 0, 255);
-            draw::setPaletteEntry(68, 0, 0, 0);
-            draw::swapcol(1, color+64);
-            draw::swapcol(2, 68);
+            switch (color) {
+                case 0: draw::setPaletteEntry(63, 255, 255, 255); break;
+                case 1: draw::setPaletteEntry(63, 255, 0, 0); break;
+                case 2: draw::setPaletteEntry(63, 0, 255, 0); break;
+                case 3: draw::setPaletteEntry(63, 0, 0, 255); break;
+            }
             const int len = text.length();
             for (int i=0;i<len;++i)
             {
@@ -133,8 +133,6 @@ namespace gamestate
                 draw::draw(x+i*7, y, 6, 6, (int(chr)-32)*7, 0);
             }
             draw::setTrans(255);
-            draw::restorecol(1);
-            draw::restorecol(2);
             draw::freeSurface(pic);
             draw::render();
         }

source/gamestate_prefase.cpp

@@ -100,14 +100,14 @@ namespace gamestate
         {
             draw::setSource(font);
             draw::setTrans(0);
-            for (int i=1;i<=5;++i) draw::swapcol(i, 79+i);
+            //for (int i=1;i<=5;++i) draw::swapcol(i, 79+i);
             const int len = text.length();
             for (int i=0;i<len;++i)
             {
                 char chr = text[i];
                 draw::draw(x+i*7, y, 5, 5, (int(chr)-32)*7, 0);
             }
-            for (int i=1;i<=5;++i) draw::restorecol(i);
+            //for (int i=1;i<=5;++i) draw::restorecol(i);
         }
 
     }

source/gamestate_sequence.cpp

@@ -135,13 +135,12 @@ namespace gamestate
             draw::surface *pic = draw::loadSurface("fuente2.gif");
             draw::setSource(pic);
             draw::setTrans(0);
-            draw::setPaletteEntry(64, 255, 255, 255);
-            draw::setPaletteEntry(65, 255, 0, 0);
-            draw::setPaletteEntry(66, 0, 255, 0);
-            draw::setPaletteEntry(67, 0, 0, 255);
-            draw::setPaletteEntry(68, 0, 0, 0);
-            draw::swapcol(1, color+64);
-            draw::swapcol(2, 68);
+            switch (color) {
+                case 0: draw::setPaletteEntry(63, 255, 255, 255); break;
+                case 1: draw::setPaletteEntry(63, 255, 0, 0); break;
+                case 2: draw::setPaletteEntry(63, 0, 255, 0); break;
+                case 3: draw::setPaletteEntry(63, 0, 0, 255); break;
+            }
             const int len = text.length();
             for (int i=0;i<len;++i)
             {
@@ -149,8 +148,6 @@ namespace gamestate
                 draw::draw(x+i*7, y, 6, 6, (int(chr)-32)*7, 0);
             }
             draw::setTrans(255);
-            draw::restorecol(1);
-            draw::restorecol(2);
             draw::freeSurface(pic);
             draw::render();
         }

source/jdraw.cpp

@@ -141,7 +141,7 @@ namespace draw
 
             // Copiem eixe array al nostre array de la paleta de sistema. Ara ja tenim la paleta carregada.
             for (int i=0;i<256;++i) {
-                palette[i] = i<paletteSize ? pal[i] : pal[i] = 0;
+                palette[i] = i<paletteSize ? pal[i] : 0;
             }
             //memset(palette, 0, 1024); // Fiquem tot a 0, que la paleta potser no es de 256 i quedaria basura
             //memcpy(palette, pal, paletteSize*4); // 32 bits per entrada == 4 bytes x 'paletteSize' entrades