From f9eb36f5290ba82371c1343b28de5b65b5473c95 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 11 Sep 2022 22:15:31 +0200 Subject: [PATCH] =?UTF-8?q?Cambiada=20la=20disposici=C3=B3n=20del=20marcad?= =?UTF-8?q?or?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/room/03.room | 2 +- media/tilesets/standard.png | Bin 2316 -> 2829 bytes source/scoreboard.cpp | 20 ++++++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/data/room/03.room b/data/room/03.room index a0288b7..77f6284 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -1,5 +1,5 @@ name=the edge -bgColor=bright_black +bgColor=red border=black tileset=standard.png roomUp=0 diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png index b354a2ccc3a90abae6978c298473ae6430cea794..d014b3402f346f9109ee9a713ace5cd611b0f9df 100644 GIT binary patch delta 2809 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 diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index 35851e6..030d15d 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -77,13 +77,17 @@ ScoreBoard::~ScoreBoard() // Pinta el objeto en pantalla void ScoreBoard::render() { + // Anclas + const int line1 = 19 * BLOCK; + const int line2 = line1 + (2 * BLOCK); + // Dibuja el fondo del marcador const SDL_Rect rect = {0, 18 * BLOCK, PLAY_AREA_WIDTH, GAMECANVAS_HEIGHT - PLAY_AREA_HEIGHT}; SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); SDL_RenderFillRect(renderer, &rect); // Dibuja las vidas - sprite->setPosY(19 * BLOCK); + sprite->setPosY(line2); int index; const int desp = (counter / 40) % 8; const int frame = desp % 4; @@ -103,19 +107,19 @@ void ScoreBoard::render() const color_t c = stringToColor("bright_blue"); SDL_Rect clip = {0, 8, 8, 8}; itemTexture->setColor(c.r, c.g, c.b); - itemTexture->render(renderer, 20 * BLOCK, 20 * BLOCK, &clip); + itemTexture->render(renderer, 20 * BLOCK, line2, &clip); } // Escribe los textos const std::string timeTxt = std::to_string((clock.minutes % 60) / 10) + std::to_string(clock.minutes % 10) + clock.separator + std::to_string((clock.seconds % 60) / 10) + std::to_string(clock.seconds % 10); const std::string itemsTxt = std::to_string(board->items / 100) + std::to_string((board->items % 100) / 10) + std::to_string(board->items % 10); const std::string roomsTxt = std::to_string(board->rooms / 100) + std::to_string((board->rooms % 100) / 10) + std::to_string(board->rooms % 10); - this->text->writeColored(22 * BLOCK, 20 * BLOCK, "Rooms", stringToColor("yellow")); - this->text->writeColored(28 * BLOCK, 20 * BLOCK, roomsTxt, stringToColor("bright_blue")); - this->text->writeColored(BLOCK, 22 * BLOCK, "Items collected ", stringToColor("yellow")); - this->text->writeColored(17 * BLOCK, 22 * BLOCK, itemsTxt, stringToColor("bright_blue")); - this->text->writeColored(20 * BLOCK, 22 * BLOCK, " Time ", stringToColor("yellow")); - this->text->writeColored(26 * BLOCK, 22 * BLOCK, timeTxt, stringToColor("bright_blue")); + this->text->writeColored(BLOCK, line1, "Items collected ", stringToColor("yellow")); + this->text->writeColored(17 * BLOCK, line1, itemsTxt, stringToColor("bright_blue")); + this->text->writeColored(20 * BLOCK, line1, " Time ", stringToColor("yellow")); + this->text->writeColored(26 * BLOCK, line1, timeTxt, stringToColor("bright_blue")); + this->text->writeColored(22 * BLOCK, line2, "Rooms", stringToColor("yellow")); + this->text->writeColored(28 * BLOCK, line2, roomsTxt, stringToColor("bright_blue")); } // Actualiza las variables del objeto