From 270d7d1848ebdc78b9741773afc7bd10ca1a2358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Thu, 6 Feb 2025 10:31:32 +0100 Subject: [PATCH] =?UTF-8?q?Duplicada=20la=20font=2004b=5F25=20per=20a=20ti?= =?UTF-8?q?ndre=20versi=C3=B3=20gris=20i=20versi=C3=B3=20negra.=20La=20gri?= =?UTF-8?q?s=20es=20la=20que=20es=20por=20modular=20amb=20colors.=20Elimin?= =?UTF-8?q?ada=20la=20font=20nokia=20que=20ja=20no=20s'estava=20utilitzant?= =?UTF-8?q?.=20Optimitzada=20la=20c=C3=A0rrega=20de=20fonts=20al=20permetr?= =?UTF-8?q?e=20reutilitzar=20fitxers=20.txt=20de=20altres=20fonts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/font/04b_25.png | Bin 3126 -> 3237 bytes data/font/04b_25_grey.png | Bin 0 -> 3126 bytes .../{04b_25_var01.png => 04b_25_metal.png} | Bin data/font/04b_25_var01.txt | 194 ------------------ data/font/nokia.png | Bin 2464 -> 0 bytes data/font/nokia.txt | 194 ------------------ source/director.cpp | 8 +- source/hiscore_table.cpp | 2 +- source/intro.cpp | 2 +- source/resource.cpp | 32 ++- 10 files changed, 27 insertions(+), 405 deletions(-) create mode 100644 data/font/04b_25_grey.png rename data/font/{04b_25_var01.png => 04b_25_metal.png} (100%) delete mode 100644 data/font/04b_25_var01.txt delete mode 100644 data/font/nokia.png delete mode 100644 data/font/nokia.txt diff --git a/data/font/04b_25.png b/data/font/04b_25.png index a87d2a98ac75e8b5a3abdad4681f97c7646907d9..dfc7409f4a5a21628b7ffb3257ddb560b3f05374 100644 GIT binary patch delta 3221 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 -8 -# 63 ? -8 -# 64 @ -11 -# 65 A -8 -# 66 B -8 -# 67 C -8 -# 68 D -8 -# 69 E -8 -# 70 F -8 -# 71 G -8 -# 72 H -8 -# 73 I -5 -# 74 J -8 -# 75 K -8 -# 76 L -8 -# 77 M -11 -# 78 N -8 -# 79 O -8 -# 80 P -8 -# 81 Q -8 -# 82 R -8 -# 83 S -8 -# 84 T -9 -# 85 U -8 -# 86 V -8 -# 87 W -11 -# 88 X -8 -# 89 Y -8 -# 90 Z -8 -# 91 [ -7 -# 92 \ -11 -# 93 ] -7 -# 94 ^ -6 -# 95 _ -7 -# 96 ` -6 -# 97 a -8 -# 98 b -8 -# 99 c -8 -# 100 d -8 -# 101 e -8 -# 102 f -8 -# 103 g -8 -# 104 h -8 -# 105 i -5 -# 106 j -8 -# 107 k -8 -# 108 l -8 -# 109 m -11 -# 110 n -8 -# 111 o -8 -# 112 p -8 -# 113 q -8 -# 114 r -8 -# 115 s -8 -# 116 t -9 -# 117 u -8 -# 118 v -8 -# 119 w -11 -# 120 x -8 -# 121 y -8 -# 122 z -8 -# 123 { -1 -# 124 | -1 -# 125 } -1 -# 126 ~ -1 \ No newline at end of file diff --git a/data/font/nokia.png b/data/font/nokia.png deleted file mode 100644 index 7e40857b8d270c0f2965b36d2c6f79dc8e17548a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 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 e73&k>dE!4YM)#xcvo!($0000 -6 -# 63 ? -7 -# 64 @ -8 -# 65 A -7 -# 66 B -7 -# 67 C -7 -# 68 D -7 -# 69 E -7 -# 70 F -7 -# 71 G -7 -# 72 H -7 -# 73 I -4 -# 74 J -6 -# 75 K -8 -# 76 L -6 -# 77 M -9 -# 78 N -8 -# 79 O -8 -# 80 P -7 -# 81 Q -8 -# 82 R -7 -# 83 S -6 -# 84 T -8 -# 85 U -7 -# 86 V -8 -# 87 W -9 -# 88 X -8 -# 89 Y -8 -# 90 Z -7 -# 91 [ -4 -# 92 \ -5 -# 93 ] -4 -# 94 ^ -5 -# 95 _ -8 -# 96 ` -4 -# 97 a -7 -# 98 b -7 -# 99 c -6 -# 100 d -7 -# 101 e -7 -# 102 f -5 -# 103 g -7 -# 104 h -7 -# 105 i -4 -# 106 j -5 -# 107 k -7 -# 108 l -4 -# 109 m -10 -# 110 n -7 -# 111 o -7 -# 112 p -7 -# 113 q -7 -# 114 r -6 -# 115 s -6 -# 116 t -5 -# 117 u -7 -# 118 v -7 -# 119 w -9 -# 120 x -7 -# 121 y -7 -# 122 z -7 -# 123 { -> ñ -7 -# 124 | -> ç -7 -# 125 } -0 -# 126 ~ -0 \ No newline at end of file diff --git a/source/director.cpp b/source/director.cpp index 244ea93..9814801 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -52,7 +52,7 @@ Director::Director(int argc, const char *argv[]) section::name = section::Name::GAME; section::options = section::Options::GAME_PLAY_1P; #elif DEBUG - section::name = section::Name::HI_SCORE_TABLE; + section::name = section::Name::LOGO; #else // NORMAL GAME section::name = section::Name::LOGO; section::attract_mode = section::AttractMode::TITLE_TO_DEMO; @@ -536,8 +536,6 @@ void Director::setFileList() // Fuentes de texto Asset::get()->add(prefix + "/data/font/8bithud.png", AssetType::BITMAP); Asset::get()->add(prefix + "/data/font/8bithud.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/nokia.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/nokia.txt", AssetType::FONT); Asset::get()->add(prefix + "/data/font/smb2.gif", AssetType::BITMAP); Asset::get()->add(prefix + "/data/font/smb2_palette1.pal", AssetType::PALETTE); Asset::get()->add(prefix + "/data/font/smb2.txt", AssetType::FONT); @@ -545,8 +543,8 @@ void Director::setFileList() Asset::get()->add(prefix + "/data/font/04b_25.txt", AssetType::FONT); Asset::get()->add(prefix + "/data/font/04b_25_2x.png", AssetType::BITMAP); Asset::get()->add(prefix + "/data/font/04b_25_2x.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/04b_25_var01.png", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/04b_25_var01.txt", AssetType::FONT); + Asset::get()->add(prefix + "/data/font/04b_25_metal.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/font/04b_25_grey.png", AssetType::BITMAP); // Textos Asset::get()->add(prefix + "/data/lang/es_ES.txt", AssetType::LANG); diff --git a/source/hiscore_table.cpp b/source/hiscore_table.cpp index 1300c1b..8211db8 100644 --- a/source/hiscore_table.cpp +++ b/source/hiscore_table.cpp @@ -260,7 +260,7 @@ std::string HiScoreTable::format(int number) // Crea los sprites con los textos void HiScoreTable::createSprites() { - auto header_text = Resource::get()->getText("04b_25"); + auto header_text = Resource::get()->getText("04b_25_grey"); auto entry_text = Resource::get()->getText("smb2"); // Obtiene el tamaño de la textura diff --git a/source/intro.cpp b/source/intro.cpp index 18c4439..3d09423 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -21,7 +21,7 @@ // Constructor Intro::Intro() : texture_(Resource::get()->getTexture("intro.png")), - text_(Resource::get()->getText("04b_25_var01")) + text_(Resource::get()->getText("04b_25_metal")) { // Inicializa variables diff --git a/source/resource.cpp b/source/resource.cpp index 8deb24a..e9f4b8c 100644 --- a/source/resource.cpp +++ b/source/resource.cpp @@ -315,23 +315,35 @@ void Resource::createTextures() } } -// Crea los objetos de texto void Resource::createText() { + struct ResourceInfo + { + std::string key; // Identificador del recurso + std::string textureFile; // Nombre del archivo de textura + std::string textFile; // Nombre del archivo de texto + + // Constructor para facilitar la creación de objetos ResourceInfo + ResourceInfo(const std::string &k, const std::string &tFile, const std::string &txtFile) + : key(k), textureFile(tFile), textFile(txtFile) {} + }; + std::cout << "\n>> CREATING TEXT_OBJECTS" << std::endl; - std::vector> resources = { - {"04b_25", "04b_25.png"}, - {"04b_25_2x", "04b_25_2x.png"}, - {"04b_25_var01", "04b_25_var01.png"}, - {"8bithud", "8bithud.png"}, - {"nokia", "nokia.png"}, - {"smb2", "smb2.gif"}}; + std::vector resources = { + {"04b_25", "04b_25.png", "04b_25.txt"}, + {"04b_25_2x", "04b_25_2x.png", "04b_25_2x.txt"}, + {"04b_25_metal", "04b_25_metal.png", "04b_25.txt"}, + {"04b_25_grey", "04b_25_grey.png", "04b_25.txt"}, + {"8bithud", "8bithud.png", "8bithud.txt"}, + {"smb2", "smb2.gif", "smb2.txt"}}; for (const auto &resource : resources) { - texts_.emplace_back(ResourceText(resource.first, std::make_shared(getTexture(resource.second), getTextFile(resource.first + ".txt")))); - printWithDots("Text : ", resource.first, "[ DONE ]"); + texts_.emplace_back(ResourceText(resource.key, std::make_shared( + getTexture(resource.textureFile), + getTextFile(resource.textFile)))); + printWithDots("Text : ", resource.key, "[ DONE ]"); } }