diff --git a/media/gfx/font_nokia.png b/media/gfx/font_nokia.png index e25095d..6f9d351 100644 Binary files a/media/gfx/font_nokia.png and b/media/gfx/font_nokia.png differ diff --git a/media/gfx/font_white.png b/media/gfx/font_white.png index 71bcd7c..b11fade 100644 Binary files a/media/gfx/font_white.png and b/media/gfx/font_white.png differ diff --git a/source/lang.h b/source/lang.h index b68646e..3a65dcf 100644 --- a/source/lang.h +++ b/source/lang.h @@ -51,7 +51,7 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] = "FAKE FULLSCREEN"}, // 7 - {"TAMAÑO DE VENTANA", + {"TAMA^O DE VENTANA", "TAMANY DE FINESTRA", "WINDOW SIZE"}, @@ -136,9 +136,9 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] = "PRESS ANY KEY"}, // 24 - {"ESPAÑOL", - "ESPAÑOL (ESPANYOL)", - "ESPAÑOL (SPANISH)"}, + {"ESPA^OL", + "ESPA^OL (ESPANYOL)", + "ESPA^OL (SPANISH)"}, // 25 {"BALOONCIA (VALENCIANO)", @@ -151,7 +151,7 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] = "ENGLISH"}, // 27 - INTRO - {"Un dia cualquiera del año 2000", + {"Un dia cualquiera del a^o 2000", "Un dia qualsevol de l'any 2000", "Any day of the year 2000"}, @@ -166,7 +166,7 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] = "Until a bastard arrives..."}, // 30 - {"HEY! ME VOY A HACER UN TALLADET...", + {"HEY! VOY A SACARME UN TALLADET...", "HEY! ME ANE A FERME UN CORTAET...", " YO! GONNA TAKE A CAFELITO... "}, @@ -181,7 +181,7 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] = "Wait a moment..."}, // 33 - {"Si resulta que no llevo suelto!", + {"Si no llevo suelto encima!", "Si resulta que no tinc solt!", " I don't have any loose! "}, diff --git a/source/text.cpp b/source/text.cpp index ae9547b..4736528 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -34,7 +34,7 @@ void Text::init(Uint8 type, Uint8 size) const std::string text = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ{\\[]]^_`abcdefghijklmnopqrstuvwxyz"; // Inicializa a cero el vector con las coordenadas - for (int i = 0; i < 255; i++) + for (int i = 0; i < 128; i++) { mOffset[i].x = 0; mOffset[i].y = 0; @@ -50,6 +50,15 @@ void Text::init(Uint8 type, Uint8 size) mOffset[int(text[i])].w = size; } + // Establece las coordenadas de forma manual para la ñ y la ç + mOffset[int('^')].x = mOffset[int('z')].x + size; + mOffset[int('^')].y = mOffset[int('z')].y; + mOffset[int('^')].w = size; + + mOffset[int('~')].x = mOffset[int('z')].x + size * 2; + mOffset[int('~')].y = mOffset[int('z')].y; + mOffset[int('~')].w = size; + // Establece el ancho de cada caracter if (type == TEXT_VARIABLE) { @@ -102,6 +111,10 @@ void Text::init(Uint8 type, Uint8 size) mOffset[int('Y')].w = 8; mOffset[int('Z')].w = 7; + mOffset[int('^')].w = 7; + mOffset[int('~')].w = 7; + + mOffset[int('a')].w = 7; mOffset[int('b')].w = 7; mOffset[int('c')].w = 6;