From 85a082d7380c2b90b7edd8cc5db2c77ef4d5e384 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 15 Sep 2024 18:11:20 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adida=20la=20funci=C3=B3n=20boolToOnOff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/common/utils.cpp | 86 +++++++++++++++++++---------------------- source/common/utils.h | 3 ++ 2 files changed, 42 insertions(+), 47 deletions(-) diff --git a/source/common/utils.cpp b/source/common/utils.cpp index d6f040b..3b5c949 100644 --- a/source/common/utils.cpp +++ b/source/common/utils.cpp @@ -146,27 +146,19 @@ bool checkCollision(SDL_Point &p, SDL_Rect &r) // Convierte una cadena en un valor booleano bool stringToBool(std::string str) { - if (str == "true") - { - return true; - } - else - { - return false; - } + return str == "true" ? true : false; } // Convierte un valor booleano en una cadena std::string boolToString(bool value) { - if (value) - { - return "true"; - } - else - { - return "false"; - } + return value == true ? "true" : "false"; +} + +// Convierte un valor booleano en una cadena "on" o "off" +std::string boolToOnOff(bool value) +{ + return value == true ? "on" : "off"; } // Convierte una cadena a minusculas @@ -225,40 +217,40 @@ hiScoreEntry_t sortHiScoreTable(hiScoreEntry_t entry1, hiScoreEntry_t entry2) } // Dibuja un circulo -void DrawCircle(SDL_Renderer * renderer, int32_t centerX, int32_t centerY, int32_t radius) +void DrawCircle(SDL_Renderer *renderer, int32_t centerX, int32_t centerY, int32_t radius) { - const int32_t diameter = (radius * 2); + const int32_t diameter = (radius * 2); - int32_t x = (radius - 1); - int32_t y = 0; - int32_t tx = 1; - int32_t ty = 1; - int32_t error = (tx - diameter); + int32_t x = (radius - 1); + int32_t y = 0; + int32_t tx = 1; + int32_t ty = 1; + int32_t error = (tx - diameter); - while (x >= y) - { - // Each of the following renders an octant of the circle - SDL_RenderDrawPoint(renderer, centerX + x, centerY - y); - SDL_RenderDrawPoint(renderer, centerX + x, centerY + y); - SDL_RenderDrawPoint(renderer, centerX - x, centerY - y); - SDL_RenderDrawPoint(renderer, centerX - x, centerY + y); - SDL_RenderDrawPoint(renderer, centerX + y, centerY - x); - SDL_RenderDrawPoint(renderer, centerX + y, centerY + x); - SDL_RenderDrawPoint(renderer, centerX - y, centerY - x); - SDL_RenderDrawPoint(renderer, centerX - y, centerY + x); + while (x >= y) + { + // Each of the following renders an octant of the circle + SDL_RenderDrawPoint(renderer, centerX + x, centerY - y); + SDL_RenderDrawPoint(renderer, centerX + x, centerY + y); + SDL_RenderDrawPoint(renderer, centerX - x, centerY - y); + SDL_RenderDrawPoint(renderer, centerX - x, centerY + y); + SDL_RenderDrawPoint(renderer, centerX + y, centerY - x); + SDL_RenderDrawPoint(renderer, centerX + y, centerY + x); + SDL_RenderDrawPoint(renderer, centerX - y, centerY - x); + SDL_RenderDrawPoint(renderer, centerX - y, centerY + x); - if (error <= 0) - { - ++y; - error += ty; - ty += 2; - } + if (error <= 0) + { + ++y; + error += ty; + ty += 2; + } - if (error > 0) - { - --x; - tx += 2; - error += (tx - diameter); - } - } + if (error > 0) + { + --x; + tx += 2; + error += (tx - diameter); + } + } } \ No newline at end of file diff --git a/source/common/utils.h b/source/common/utils.h index 09c686c..869eb07 100644 --- a/source/common/utils.h +++ b/source/common/utils.h @@ -272,6 +272,9 @@ bool stringToBool(std::string str); // Convierte un valor booleano en una cadena std::string boolToString(bool value); +// Convierte un valor booleano en una cadena "on" o "off" +std::string boolToOnOff(bool value); + // Convierte una cadena a minusculas std::string toLower(std::string str);