From 521ef3688069f5fc6b06a835454404fddaca6e80 Mon Sep 17 00:00:00 2001 From: HampusM Date: Sun, 12 Jun 2022 18:23:10 +0200 Subject: fix: add statusline length check --- src/game/game.cpp | 19 ++++++++++++++++--- src/game/game.hpp | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'src/game') diff --git a/src/game/game.cpp b/src/game/game.cpp index 2f6c09c..e969fe1 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include Game::Game( @@ -42,7 +43,7 @@ Game::Game( { } -void Game::on_start() noexcept +void Game::on_start() { const auto scene_size = _scene->size(); @@ -55,8 +56,20 @@ void Game::on_start() noexcept const auto statusline_section_d_length = 20; const auto statusline_section_e_length = 25; const auto statusline_section_f_length = 30; - const auto statusline_section_g_length = 30; - const auto statusline_section_h_length = 20; + const auto statusline_section_g_length = 20; + const auto statusline_section_h_length = 3; + + const auto statusline_section_length_total = + statusline_section_a_length + statusline_section_b_length + + statusline_section_c_length + statusline_section_d_length + + statusline_section_e_length + statusline_section_f_length + + statusline_section_g_length + statusline_section_h_length; + + if (statusline_section_length_total > scene_size.get_width()) + { + throw std::runtime_error( + "To small window terminal size. The statusline doesn't fit"); + } statusline->set_section_length(StatusLineSection::A, statusline_section_a_length); statusline->set_section_length(StatusLineSection::B, statusline_section_b_length); diff --git a/src/game/game.hpp b/src/game/game.hpp index e69ce46..ed5a00f 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -64,7 +64,7 @@ public: std::shared_ptr cell_helper, std::shared_ptr rle_reader) noexcept; - void on_start() noexcept override; + void on_start() override; void on_update() noexcept override; -- cgit v1.2.3-18-g5258