init lol

ThomasByr · May 7, 2023 · 5a1116f · 5a1116f
1 parent c044da1
commit 5a1116f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/inc/core/map.h b/inc/core/map.h
@@ -178,9 +178,9 @@ class Map {
    * (i.e. if the ghosts have been eaten once during the current power)
    * 
    * @param ghost index/type of the ghost
-   * @return int  option
+   * @return bool option
    */
-  int get_ghosts_powered(int ghost) const;
+  bool get_ghosts_powered(int ghost) const;
 };
 
 #endif // __inc_core_map_H__
diff --git a/src/core/ghost.cpp b/src/core/ghost.cpp
@@ -228,9 +228,7 @@ void Ghost::update(std::shared_ptr<Map> map, std::tuple<int, int> pacman_pos,
     if (is_at_home) {
       switch (type) {
       case GhostType::CLYDE: m_timer.start_timer(20); break;
-
       case GhostType::PINKY: m_timer.start_timer(0); break;
-
       case GhostType::INKY: m_timer.start_timer(10); break;
 
       default: m_timer.start_timer(dis(gen));
@@ -243,11 +241,12 @@ void Ghost::update(std::shared_ptr<Map> map, std::tuple<int, int> pacman_pos,
   if (!is_at_home && state != GhstState::FRIGHTENED &&
       map->get_ghosts_powered(static_cast<int>(type))) {
     state = GhstState::FRIGHTENED;
+    fmt::debug("lol");
     m_timer.reset_timer(); // reset to use global timer
   }
 
   // change state
-  if ((m_timer.is_running() && m_timer.is_expired()) || p_timer->is_expired()) {
+  if (m_timer.is_expired() /* || !m_timer.is_running() */) {
     if (is_at_home) {
       is_at_home = false;
       m_timer.reset_timer();
@@ -276,6 +275,7 @@ void Ghost::update(std::shared_ptr<Map> map, std::tuple<int, int> pacman_pos,
     }
   }
   // go out of frightened state
+  // we cannot check if the timer is expired because it might be reset
   if (state == GhstState::FRIGHTENED && !p_timer->is_running()) {
     state = GhstState::SCATTER;
     m_timer.reset_timer();
@@ -349,7 +349,7 @@ void Ghost::reset() {
   is_at_home = type != GhostType::BLINKY;
   m_direction = is_at_home ? Direction::UP : Direction::NONE;
   m_reg_direction = Direction::NONE;
-  state = GhstState::CHASE;
+  state = GhstState::SCATTER;
   m_timer.reset_timer(); // timer will start itself in update
 }
 

diff --git a/src/core/map.cpp b/src/core/map.cpp
@@ -276,6 +276,7 @@ void Map::reset(const std::string &path) {
   using namespace std;
 
   power_timer = std::make_shared<sys_pause::Timer>();
+  ghosts_powered = std::array<bool, 4>{false, false, false, false};
 
   ifstream file{path};
   string line = "";
@@ -336,6 +337,6 @@ void Map::set_ghosts_powered(const bool powered, std::optional<int> ghost) {
   }
 }
 
-int Map::get_ghosts_powered(int ghost) const {
+bool Map::get_ghosts_powered(int ghost) const {
   return ghosts_powered.at(ghost);
 }
diff --git a/src/helper/renderer.cpp b/src/helper/renderer.cpp
@@ -1,4 +1,6 @@
 
+#include <thread>
+
 #include "ini.hpp"
 
 #include "helper/assets.h"
@@ -8,8 +10,8 @@
 
 Renderer::Renderer(const std::string &title, const std::string &config_path)
   : m_window{nullptr}, m_surface{nullptr}, m_sprites{nullptr}, m_scale{1},
-    size{0}, m_config_stack{},
-    m_rect_mode{RectMode::CORNER}, m_trans_x{0}, m_trans_y{0} {
+    size{0}, m_config_stack{}, m_rect_mode{RectMode::CORNER}, m_trans_x{0},
+    m_trans_y{0} {
   ini::IniFile data;
   try {
     data.load(config_path);
@@ -78,7 +80,11 @@ void Renderer::flip() {
 
   double target_delay = ms_in_s / m_fps;
   auto wait_time = target_delay - static_cast<double>(elapsed_time);
-  if (wait_time > 0) SDL_Delay(static_cast<Uint32>(wait_time));
+  // if (wait_time > 0) SDL_Delay(static_cast<Uint32>(wait_time));
+  if (wait_time > 0) {
+    std::this_thread::sleep_for(
+      std::chrono::milliseconds(static_cast<Uint32>(wait_time)));
+  }
 
   // update window as soon as we delay
   switch (SDL_UpdateWindowSurface(m_window)) {