From 0299ec4fd912df6b45e96b1b9d7281a292b57883 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Tue, 9 Jul 2024 19:32:37 +0200 Subject: [PATCH] - Colors del text dels menus canviats --- source/m_ingame.cpp | 6 +++--- source/m_menu.cpp | 28 ++++++++++++++-------------- source/m_menu_audio.cpp | 12 ++++++------ source/m_menu_tecles.cpp | 12 ++++++------ 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/source/m_ingame.cpp b/source/m_ingame.cpp index b6ee12b..55d533b 100644 --- a/source/m_ingame.cpp +++ b/source/m_ingame.cpp @@ -84,16 +84,16 @@ namespace modules } - draw::print2("PAUSA", 17, 3, YELLOW, FONT_ZOOM_VERTICAL); + draw::print2("PAUSA", 17, 3, TEAL, FONT_ZOOM_VERTICAL); switch (selected_option) { case INGAME_CONTINUAR: draw::print2("fg CONTINUAR", 13, 19, YELLOW, FONT_ZOOM_VERTICAL); - draw::print2("de EIXIR", 13, 22, TEAL, FONT_ZOOM_NONE); + draw::print2("de EIXIR", 13, 22, GREEN, FONT_ZOOM_NONE); break; case INGAME_EIXIR: - draw::print2("de CONTINUAR", 13, 19, TEAL, FONT_ZOOM_NONE); + draw::print2("de CONTINUAR", 13, 19, GREEN, FONT_ZOOM_NONE); draw::print2("fg EIXIR", 13, 21, YELLOW, FONT_ZOOM_VERTICAL); break; diff --git a/source/m_menu.cpp b/source/m_menu.cpp index a6b2509..cc66c26 100644 --- a/source/m_menu.cpp +++ b/source/m_menu.cpp @@ -49,33 +49,33 @@ namespace modules retras--; if (retras==0) {retras=4; anim_pos=(anim_pos+1)&1; } - draw::print2("THE POOL", 16, 3, YELLOW, FONT_ZOOM_VERTICAL); + draw::print2("THE POOL", 16, 3, TEAL, FONT_ZOOM_VERTICAL); switch (selected_option) { case OPTION_JUGAR: draw::print2("fg JUGAR AL JOC", 11, 14, YELLOW, FONT_ZOOM_VERTICAL); - draw::print2("de REDEFINIR TECLES", 11, 17, TEAL, FONT_ZOOM_NONE); - draw::print2("de CONFIGURAR AUDIO", 11, 19, TEAL, FONT_ZOOM_NONE); - draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE); + draw::print2("de REDEFINIR TECLES", 11, 17, GREEN, FONT_ZOOM_NONE); + draw::print2("de CONFIGURAR AUDIO", 11, 19, GREEN, FONT_ZOOM_NONE); + draw::print2("de EIXIR", 11, 21, GREEN, FONT_ZOOM_NONE); break; case OPTION_TECLES: - draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE); + draw::print2("de JUGAR AL JOC", 11, 14, GREEN, FONT_ZOOM_NONE); draw::print2("fg REDEFINIR TECLES", 11, 16, YELLOW, FONT_ZOOM_VERTICAL); - draw::print2("de CONFIGURAR AUDIO", 11, 19, TEAL, FONT_ZOOM_NONE); - draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE); + draw::print2("de CONFIGURAR AUDIO", 11, 19, GREEN, FONT_ZOOM_NONE); + draw::print2("de EIXIR", 11, 21, GREEN, FONT_ZOOM_NONE); break; case OPTION_AUDIO: - draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE); - draw::print2("de REDEFINIR TECLES", 11, 16, TEAL, FONT_ZOOM_NONE); + draw::print2("de JUGAR AL JOC", 11, 14, GREEN, FONT_ZOOM_NONE); + draw::print2("de REDEFINIR TECLES", 11, 16, GREEN, FONT_ZOOM_NONE); draw::print2("fg CONFIGURAR AUDIO", 11, 18, YELLOW, FONT_ZOOM_VERTICAL); - draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE); + draw::print2("de EIXIR", 11, 21, GREEN, FONT_ZOOM_NONE); break; case OPTION_EIXIR: - draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE); - draw::print2("de REDEFINIR TECLES", 11, 16, TEAL, FONT_ZOOM_NONE); - draw::print2("de CONFIGURAR AUDIO", 11, 18, TEAL, FONT_ZOOM_NONE); - draw::print2("fg EIXIR", 11, 21, YELLOW, FONT_ZOOM_VERTICAL); + draw::print2("de JUGAR AL JOC", 11, 14, GREEN, FONT_ZOOM_NONE); + draw::print2("de REDEFINIR TECLES", 11, 16, GREEN, FONT_ZOOM_NONE); + draw::print2("de CONFIGURAR AUDIO", 11, 18, GREEN, FONT_ZOOM_NONE); + draw::print2("fg EIXIR", 11, 20, YELLOW, FONT_ZOOM_VERTICAL); break; }; diff --git a/source/m_menu_audio.cpp b/source/m_menu_audio.cpp index 919c062..7e057f1 100644 --- a/source/m_menu_audio.cpp +++ b/source/m_menu_audio.cpp @@ -37,7 +37,7 @@ namespace modules draw::cls(2); draw::color(1); - draw::print2("CONFIGURAR AUDIO", 13, 3, YELLOW, FONT_ZOOM_VERTICAL); + draw::print2("CONFIGURAR AUDIO", 13, 3, TEAL, FONT_ZOOM_VERTICAL); const char *musica_msg = config::isMusicEnabled() ? "MUSICA: SI" : "MUSICA: NO"; const int soundmode=config::getSoundMode(); @@ -50,8 +50,8 @@ namespace modules draw::print2(musica_msg, 18, pos, YELLOW, FONT_ZOOM_VERTICAL); pos+=3; } else { - draw::print2("de", 13, pos, TEAL, FONT_ZOOM_NONE); - draw::print2(musica_msg, 18, pos, TEAL, FONT_ZOOM_NONE); + draw::print2("de", 13, pos, GREEN, FONT_ZOOM_NONE); + draw::print2(musica_msg, 18, pos, GREEN, FONT_ZOOM_NONE); pos+=2; } @@ -60,15 +60,15 @@ namespace modules draw::print2(so_msg, 18, pos, YELLOW, FONT_ZOOM_VERTICAL); pos+=3; } else { - draw::print2("de", 13, pos, TEAL, FONT_ZOOM_NONE); - draw::print2(so_msg, 18, pos, TEAL, FONT_ZOOM_NONE); + draw::print2("de", 13, pos, GREEN, FONT_ZOOM_NONE); + draw::print2(so_msg, 18, pos, GREEN, FONT_ZOOM_NONE); pos+=2; } if (selected_option==MENU_AUDIO_TORNAR) { draw::print2("fg TORNAR", 13, pos, YELLOW, FONT_ZOOM_VERTICAL); } else { - draw::print2("de TORNAR", 13, pos, TEAL, FONT_ZOOM_NONE); + draw::print2("de TORNAR", 13, pos, GREEN, FONT_ZOOM_NONE); } draw::print2("(C) JAILDOCTOR 2024", 11, 28, TEAL, FONT_ZOOM_NONE); diff --git a/source/m_menu_tecles.cpp b/source/m_menu_tecles.cpp index 3be5836..66add19 100644 --- a/source/m_menu_tecles.cpp +++ b/source/m_menu_tecles.cpp @@ -68,7 +68,7 @@ namespace modules draw::cls(2); draw::color(1); - draw::print2("REDEFINIR TECLES", 13, 3, YELLOW, FONT_ZOOM_VERTICAL); + draw::print2("REDEFINIR TECLES", 13, 3, TEAL, FONT_ZOOM_VERTICAL); int pos = 10; static const char *textos[6] = { "AMUNT:", "AVALL:", "ESQUERRA:", "DRETA:", "BOTAR: ", "AGAFAR: " }; @@ -76,15 +76,15 @@ namespace modules for (int i=0; i<6; ++i) { const bool selected = (i==selected_option); - draw::print2(selected?"fg":"de", 8, pos, selected?YELLOW:TEAL, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); - draw::print2(textos[i], 13, pos, selected?YELLOW:TEAL, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); - if (!selected || state == STATE_SELECTING) draw::print2(getKeyName(config::getKey(i)), 23, pos, selected?YELLOW:TEAL, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); + draw::print2(selected?"fg":"de", 8, pos, selected?YELLOW:GREEN, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); + draw::print2(textos[i], 13, pos, selected?YELLOW:GREEN, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); + if (!selected || state == STATE_SELECTING) draw::print2(getKeyName(config::getKey(i)), 23, pos, selected?YELLOW:GREEN, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); pos += selected?3:2; } const bool selected = (selected_option==MENU_TECLES_TORNAR); - draw::print2(selected?"fg":"de", 8, pos, selected?YELLOW:TEAL, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); - draw::print2("TORNAR", 13, pos, selected?YELLOW:TEAL, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); + draw::print2(selected?"fg":"de", 8, pos, selected?YELLOW:GREEN, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); + draw::print2("TORNAR", 13, pos, selected?YELLOW:GREEN, selected?FONT_ZOOM_VERTICAL:FONT_ZOOM_NONE); draw::print2("(C) JAILDOCTOR 2024", 11, 28, TEAL, FONT_ZOOM_NONE);