From cee7c198320e3fe5e821740ea54cabab6abe6ce1 Mon Sep 17 00:00:00 2001
From: JailDoctor <jaildoctor@gmail.com>
Date: Fri, 13 Oct 2023 19:59:49 +0200
Subject: [PATCH] - Arreglos per a que les fonts funcionen amb la nova paleta

---
 source/gamestate_postfase.cpp | 16 +++++++---------
 source/gamestate_prefase.cpp  |  4 ++--
 source/gamestate_sequence.cpp | 15 ++++++---------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/source/gamestate_postfase.cpp b/source/gamestate_postfase.cpp
index bbc462a..cac3499 100644
--- a/source/gamestate_postfase.cpp
+++ b/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();
         }
diff --git a/source/gamestate_prefase.cpp b/source/gamestate_prefase.cpp
index 210498a..006fb80 100644
--- a/source/gamestate_prefase.cpp
+++ b/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);
         }
 
     }
diff --git a/source/gamestate_sequence.cpp b/source/gamestate_sequence.cpp
index cbcb093..e9d8766 100644
--- a/source/gamestate_sequence.cpp
+++ b/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();
         }