From d5dfc952c21316aa0c69e3e8b7fed5ccff2a95cd Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 19 Oct 2022 10:34:33 +0200 Subject: [PATCH] =?UTF-8?q?Limpieza=20y=20organizaci=C3=B3n=20de=20c=C3=B3?= =?UTF-8?q?digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/common/screen.cpp | 36 +++++------------------------ source/common/screen.h | 3 --- source/common/sprite.cpp | 7 ------ source/common/sprite.h | 3 --- source/game.cpp | 5 ---- source/intro.cpp | 2 -- source/item.cpp | 8 ------- source/item_tracker.cpp | 5 ---- source/item_tracker.h | 3 --- source/logo.cpp | 29 +++++------------------ source/scoreboard.cpp | 50 ++++++---------------------------------- source/test.cpp | 5 ---- source/test.h | 3 --- 13 files changed, 19 insertions(+), 140 deletions(-) diff --git a/source/common/screen.cpp b/source/common/screen.cpp index 6308cf4..98c4451 100644 --- a/source/common/screen.cpp +++ b/source/common/screen.cpp @@ -38,12 +38,6 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options, i anchor.middle = gameCanvasHeight / 2; } -// Destructor -Screen::~Screen() -{ - renderer = nullptr; -} - // Limpia la pantalla void Screen::clean(color_t color) { @@ -293,30 +287,12 @@ void Screen::iniSpectrumFade() spectrumColor.clear(); - color_t c; - c = stringToColor("black"); - spectrumColor.push_back(c); - - c = stringToColor("blue"); - spectrumColor.push_back(c); - - c = stringToColor("red"); - spectrumColor.push_back(c); - - c = stringToColor("magenta"); - spectrumColor.push_back(c); - - c = stringToColor("green"); - spectrumColor.push_back(c); - - c = stringToColor("cyan"); - spectrumColor.push_back(c); - - c = stringToColor("yellow"); - spectrumColor.push_back(c); - - c = stringToColor("bright_white"); - spectrumColor.push_back(c); + // Inicializa el vector de colores + const std::vector vColors = {"black", "blue", "red", "magenta", "green", "cyan", "yellow", "bright_white"}; + for (auto v : vColors) + { + spectrumColor.push_back(stringToColor(v)); + } } // Actualiza el spectrum fade diff --git a/source/common/screen.h b/source/common/screen.h index 81417c6..c40e64c 100644 --- a/source/common/screen.h +++ b/source/common/screen.h @@ -70,9 +70,6 @@ public: // Constructor Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options, int gameInternalResX, int gameInternalResY); - // Destructor - ~Screen(); - // Limpia la pantalla void clean(color_t color = {0x00, 0x00, 0x00}); diff --git a/source/common/sprite.cpp b/source/common/sprite.cpp index a78b50d..e5a1104 100644 --- a/source/common/sprite.cpp +++ b/source/common/sprite.cpp @@ -47,13 +47,6 @@ Sprite::Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer) enabled = true; } -// Destructor -Sprite::~Sprite() -{ - texture = nullptr; - renderer = nullptr; -} - // Muestra el sprite por pantalla void Sprite::render() { diff --git a/source/common/sprite.h b/source/common/sprite.h index 4bffe21..99d8292 100644 --- a/source/common/sprite.h +++ b/source/common/sprite.h @@ -27,9 +27,6 @@ public: Sprite(int x = 0, int y = 0, int w = 0, int h = 0, Texture *texture = nullptr, SDL_Renderer *renderer = nullptr); Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer); - // Destructor - ~Sprite(); - // Muestra el sprite por pantalla void render(); diff --git a/source/game.cpp b/source/game.cpp index 8956e51..ebeeb2a 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -57,11 +57,6 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D Game::~Game() { - // Borra las referencias a los punteros - renderer = nullptr; - asset = nullptr; - input = nullptr; - // Libera la memoria de los objetos delete scoreboard; delete itemTracker; diff --git a/source/intro.cpp b/source/intro.cpp index 373f78e..dd8d2a3 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -71,8 +71,6 @@ Intro::~Intro() JA_DeleteMusic(loadingSound1); JA_DeleteMusic(loadingSound2); JA_DeleteMusic(loadingSound3); - - // delete text; } // Comprueba el manejador de eventos diff --git a/source/item.cpp b/source/item.cpp index b4ff105..c97eb1f 100644 --- a/source/item.cpp +++ b/source/item.cpp @@ -29,14 +29,6 @@ Item::Item(item_t item) c = item.color2; color.push_back(c); color.push_back(c); - - /* - const std::vector vColors = {"blue", "red", "magenta", "green", "cyan", "yellow"}; - for (auto v:vColors) - { - color.push_back(stringToColor(v)); - } - */ } // Destructor diff --git a/source/item_tracker.cpp b/source/item_tracker.cpp index 42afddc..3699bc3 100644 --- a/source/item_tracker.cpp +++ b/source/item_tracker.cpp @@ -1,10 +1,5 @@ #include "item_tracker.h" -// Constructor -ItemTracker::ItemTracker() -{ -} - // Destructor ItemTracker::~ItemTracker() { diff --git a/source/item_tracker.h b/source/item_tracker.h index d697159..05c20e7 100644 --- a/source/item_tracker.h +++ b/source/item_tracker.h @@ -26,9 +26,6 @@ private: int findByPos(int index, SDL_Point pos); public: - // Constructor - ItemTracker(); - // Destructor ~ItemTracker(); diff --git a/source/logo.cpp b/source/logo.cpp index 24212e5..c914097 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -40,29 +40,12 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset, int subsection) endLogo = 400; postLogo = 20; - color_t c = stringToColor("black"); - color.push_back(c); - - c = stringToColor("blue"); - color.push_back(c); - - c = stringToColor("red"); - color.push_back(c); - - c = stringToColor("magenta"); - color.push_back(c); - - c = stringToColor("green"); - color.push_back(c); - - c = stringToColor("cyan"); - color.push_back(c); - - c = stringToColor("yellow"); - color.push_back(c); - - c = stringToColor("bright_white"); - color.push_back(c); + // Inicializa el vector de colores + const std::vector vColors = {"black", "blue", "red", "magenta", "green", "cyan", "yellow", "bright_white"}; + for (auto v : vColors) + { + color.push_back(stringToColor(v)); + } // Cambia el color del borde screen->setBorderColor(stringToColor("black")); diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index 8dd83f3..bdb88e4 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -24,48 +24,12 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, board_t *board) timePaused = 0; totalTimePaused = 0; - // Inicializa los colores - color_t c = stringToColor("blue"); - color.push_back(c); - - // c = stringToColor("red"); - // color.push_back(c); - - c = stringToColor("magenta"); - color.push_back(c); - - c = stringToColor("green"); - color.push_back(c); - - c = stringToColor("cyan"); - color.push_back(c); - - c = stringToColor("yellow"); - color.push_back(c); - - c = stringToColor("white"); - color.push_back(c); - - c = stringToColor("bright_blue"); - color.push_back(c); - - // c = stringToColor("bright_red"); - // color.push_back(c); - - c = stringToColor("bright_magenta"); - color.push_back(c); - - c = stringToColor("bright_green"); - color.push_back(c); - - c = stringToColor("bright_cyan"); - color.push_back(c); - - c = stringToColor("bright_yellow"); - color.push_back(c); - - c = stringToColor("bright_white"); - color.push_back(c); + // Inicializa el vector de colores + const std::vector vColors = {"blue", "magenta", "green", "cyan", "yellow", "white", "bright_blue", "bright_magenta", "bright_green", "bright_cyan", "bright_yellow", "bright_white"}; + for (auto v : vColors) + { + color.push_back(stringToColor(v)); + } } // Destructor @@ -133,7 +97,7 @@ void ScoreBoard::update() sprite->update(); if (!paused) - {// Si está en pausa no se actualiza el reloj + { // Si está en pausa no se actualiza el reloj clock = getTime(); } } diff --git a/source/test.cpp b/source/test.cpp index 814aa19..a815b9c 100644 --- a/source/test.cpp +++ b/source/test.cpp @@ -25,11 +25,6 @@ Test::Test(SDL_Renderer *renderer, Screen *screen, Asset *asset, Debug *debug) } } -// Destructor -Test::~Test() -{ -} - // Actualiza las variables void Test::update() { diff --git a/source/test.h b/source/test.h index 303e80c..661a8c1 100644 --- a/source/test.h +++ b/source/test.h @@ -36,9 +36,6 @@ public: // Constructor Test(SDL_Renderer *renderer, Screen *screen, Asset *asset, Debug *debug); - // Destructor - ~Test(); - // Actualiza las variables void update();