Merge pull request #159 from OpenBrickProtocolFoundation/bug-fixes

Fix known bugs

Author: Totto16

src/application.cpp

@@ -20,7 +20,7 @@
 #include "helper/console_helpers.hpp"
 #endif
 
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
 #include "graphics/text.hpp"
 #endif
 
@@ -58,7 +58,7 @@ Application::Application(std::shared_ptr<Window>&& window, const std::vector<std
 void Application::run() {
     m_event_dispatcher.register_listener(this);
 
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
     auto start_time = SDL_GetPerformanceCounter();
     const auto update_time = SDL_GetPerformanceFrequency() / 2; //0.5 s
     const auto count_per_s = static_cast<double>(SDL_GetPerformanceFrequency());
@@ -84,7 +84,7 @@ void Application::run() {
         render();
         m_renderer.present();
 
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
         ++frame_counter;
 
         const Uint64 current_time = SDL_GetPerformanceCounter();
@@ -244,7 +244,7 @@ void Application::render() const {
     for (const auto& scene : m_scene_stack) {
         scene->render(*this);
     }
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
     m_fps_text->render(*this);
 #endif
 }
@@ -266,7 +266,7 @@ void Application::initialize() {
 
         this->load_resources();
 
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
         m_fps_text = std::make_unique<ui::Label>(
                 this, "FPS: ?", font_manager().get(FontId::Default), Color::white(),
                 std::pair<double, double>{ 0.95, 0.95 },

src/application.hpp

@@ -34,7 +34,7 @@ struct Application final : public EventListener, public ServiceProvider {
     std::unique_ptr<FontManager> m_font_manager;
 
 
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
     std::unique_ptr<ui::Label> m_fps_text{ nullptr };
 #endif
 

src/discord/core.cpp

@@ -15,7 +15,7 @@
         case ArtAsset::logo:
             return "logo";
         default:
-            utils::unreachable();
+            UNREACHABLE();
     }
 }
 
@@ -50,7 +50,7 @@ void DiscordInstance::after_setup() {
 
 
     core->SetLogHook(
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
             discord::LogLevel::Debug
 #else
             discord::LogLevel::Error

src/game/game.cpp

@@ -8,11 +8,12 @@ Game::Game(
         ServiceProvider* const service_provider,
         const std::shared_ptr<input::GameInput>& input,
         const tetrion::StartingParameters& starting_parameters,
+        u32 simulation_frequency,
         const ui::Layout& layout,
         bool is_top_level
 )
     : ui::Widget{ layout, ui::WidgetType::Component, is_top_level },
-      m_clock_source{ std::make_unique<LocalClock>(starting_parameters.target_fps) },
+      m_clock_source{ std::make_unique<LocalClock>(simulation_frequency) },
       m_input{ input } {
 
 

src/game/game.hpp

@@ -21,6 +21,7 @@ struct Game : public ui::Widget {
             ServiceProvider* service_provider,
             const std::shared_ptr<input::GameInput>& input,
             const tetrion::StartingParameters& starting_parameters,
+            u32 simulation_frequency,
             const ui::Layout& layout,
             bool is_top_level
     );

src/game/graphic_helpers.cpp

@@ -21,7 +21,7 @@ namespace {
             case MinoTransparency::Solid:
                 return utils::to_underlying(transparency);
             default:
-                utils::unreachable();
+                UNREACHABLE();
         }
     }
 } // namespace

src/game/tetrion.cpp

@@ -452,7 +452,7 @@ void Tetrion::lock_active_tetromino(const SimulationStep simulation_step_index)
     reset_lock_delay(simulation_step_index);
 
     // save a snapshot on every freeze (only in debug builds)
-#ifdef DEBUG_BUILD
+#if !defined(NDEBUG)
     if (m_recording_writer) {
         spdlog::debug("adding snapshot at step {}", simulation_step_index);
         (*m_recording_writer)->add_snapshot(m_tetrion_index, simulation_step_index, core_information());
@@ -561,7 +561,7 @@ u8 Tetrion::rotation_to_index(const Rotation from, const Rotation rotation_to) {
     if (from == Rotation::North and rotation_to == Rotation::West) {
         return 7;
     }
-    utils::unreachable();
+    UNREACHABLE();
 }
 
 bool Tetrion::is_tetromino_position_valid(const Tetromino& tetromino) const {
@@ -628,7 +628,7 @@ bool Tetrion::move(const Tetrion::MoveDirection move_direction) {
             return true;
     }
 
-    utils::unreachable();
+    UNREACHABLE();
 }
 
 helper::optional<const Tetrion::WallKickTable*> Tetrion::get_wall_kick_table() const {
@@ -646,6 +646,6 @@ helper::optional<const Tetrion::WallKickTable*> Tetrion::get_wall_kick_table() c
         case helper::TetrominoType::O:
             return {};
         default:
-            utils::unreachable();
+            UNREACHABLE();
     }
 }

src/graphics/texture.cpp

@@ -37,7 +37,7 @@ Texture Texture::prerender_text(
                 font.get(), text.c_str(), text_color, utils::sdl_color_from_color(background_color)
         );
     } else {
-        utils::unreachable();
+        UNREACHABLE();
     }
     if (surface == nullptr) {
         throw std::runtime_error(fmt::format("Failed to pre-render text into surface with error: {}", SDL_GetError()));

src/helper/color.cpp

@@ -153,7 +153,7 @@ namespace {
             return color.to_string(force_alpha);
         }
         default:
-            utils::unreachable();
+            UNREACHABLE();
     }
 }
 

src/helper/color.hpp

@@ -208,7 +208,7 @@ struct Color {
                 d_b = x_offset;
                 break;
             default:
-                utils::unreachable();
+                UNREACHABLE();
         }