Added check for initial states

pratofeito · Aug 3, 2022 · 6379626 · 6379626
1 parent 6ae1197
commit 6379626
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/engine/include/state/state-handler.hpp b/engine/include/state/state-handler.hpp
@@ -26,8 +26,8 @@ namespace pte
         void add_state(state_ref new_state, bool replacing);
         void remove_state();
         void process_state_changes();
-        int get_states_size();
-
+        bool have_state_active();
+        
         state_ref &get_active_state();
     };
 }

diff --git a/engine/src/game/game.cpp b/engine/src/game/game.cpp
@@ -11,17 +11,15 @@ namespace pte
 
     void Game::run()
     {
-
         // start a new splash state
         data->state_handler.add_state(state_ref(new SplashState(this->data)), true);
 
-        std::cout << data->state_handler.get_states_size() << std::endl;
-        // check if the game have one state to start
-        // if (data->state_handler.get_states_size() != 0)
-        // {
-        //     std::cerr << "No states initialized. Exiting." << std::endl;
-        //     exit(100);
-        // }
+        //check if the game have one state to start
+        if (data->state_handler.have_state_active() == false)
+        {
+            std::cerr << "No states initialized. Exiting." << std::endl;
+            exit(100);
+        }
 
         float new_time, frame_time, interpolation;
         float current_time = this->clock.getElapsedTime().asSeconds();

diff --git a/engine/src/state/state-handler.cpp b/engine/src/state/state-handler.cpp
@@ -1,4 +1,5 @@
 #include "state/state-handler.hpp"
+#include <iostream>
 
 namespace pte
 {
@@ -53,7 +54,15 @@ namespace pte
         return this->states.top();
     }
 
-    int StateHandler::get_states_size() {
-        return this->states.size();
+    bool StateHandler::have_state_active()
+    {
+        if (this->new_state == nullptr)
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
     }
 }