From f44f89fee2c3a50be41ba6421cb28e691e945827 Mon Sep 17 00:00:00 2001 From: Nyako <87289390+NyakoFox@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:51:38 -0300 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai --- desktop_version/src/Game.cpp | 27 +++++++++++++-------------- desktop_version/src/Render.cpp | 8 ++++---- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index d792ac77..1c47b0fb 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -498,15 +498,15 @@ void Game::deletecustomlevelstats(void) { \ /* We're loading in 32-bit integers. If we need more than 16 chars, * something is seriously wrong */ \ - char buffer[16]; \ - size_t start = 0; \ - size_t i = 0; \ - \ - while (next_split_s(buffer, sizeof(buffer), &start, pText, ',')) \ - { \ - DEST.insert(help.Int(buffer)); \ - ++i; \ - } \ + char buffer[16]; \ + size_t start = 0; \ + size_t i = 0; \ + \ + while (next_split_s(buffer, sizeof(buffer), &start, pText, ',')) \ + { \ + DEST.insert(help.Int(buffer)); \ + ++i; \ + } \ } #define LOAD_ARRAY_RENAME(ARRAY_NAME, DEST) \ @@ -6000,11 +6000,10 @@ bool Game::customsavequick(const std::string& savfile) std::string coincollect; std::set::iterator iterator = obj.coincollect.begin(); - while (iterator != obj.coincollect.end()) { - { - coincollect += help.String(*iterator) + ","; - iterator++; - } + while (iterator != obj.coincollect.end()) + { + coincollect += help.String(*iterator) + ","; + iterator++; } xml::update_tag(msgs, "coincollect", coincollect.c_str()); diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index c80c7d32..f0487e5e 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -2071,16 +2071,16 @@ void gamerender(void) } bool show_coins = game.coins() > 0; -#ifndef NO_CUSTOM_LEVELS show_coins = show_coins || (map.custommode && (cl.numcoins() > 0)); -#endif - if (show_coins) { + if (show_coins) + { int color = 255 - help.glow / 2; font::print(PR_BOR | PR_RIGHT, 304, 231, help.String(game.coins()), color, color, 196); - if (!graphics.notextoutline) { + if (!graphics.notextoutline) + { graphics.draw_grid_tile(graphics.grphx.im_tiles_white, 48, 310, 230, 8, 8, graphics.getRGB(0, 0, 0)); graphics.draw_grid_tile(graphics.grphx.im_tiles_white, 48, 312, 230, 8, 8, graphics.getRGB(0, 0, 0)); graphics.draw_grid_tile(graphics.grphx.im_tiles_white, 48, 311, 229, 8, 8, graphics.getRGB(0, 0, 0));