JailDoctor/arounders
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
JailDoctor
2023-10-13 19:59:49 +02:00
parent 1967cc33db
commit cee7c19832
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/gamestate_postfase.cpp
View File

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

4
source/gamestate_prefase.cpp
View File

@@ -100,14 +100,14 @@ namespace gamestate
{ {
draw::setSource(font); draw::setSource(font);
draw::setTrans(0); 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(); const int len = text.length();
for (int i=0;i<len;++i) for (int i=0;i<len;++i)
{ {
char chr = text[i]; char chr = text[i];
draw::draw(x+i*7, y, 5, 5, (int(chr)-32)*7, 0); 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);
} }
} }

15
source/gamestate_sequence.cpp
View File

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