From de6bdf61fe5b8bf5454f835df72ccfbbdfb671f2 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 20 Jun 2021 12:17:43 +0200
Subject: [PATCH] Fixing the pause timer

---
 sources/Runner/GameScene.cpp      |  1 +
 sources/Runner/PauseMenuScene.cpp | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sources/Runner/GameScene.cpp b/sources/Runner/GameScene.cpp
index a9103241..eb154824 100644
--- a/sources/Runner/GameScene.cpp
+++ b/sources/Runner/GameScene.cpp
@@ -126,6 +126,7 @@ namespace BBM
 					if (!ent.hasComponent<SoundComponent>())
 						return;
 					ent.removeComponent<SoundComponent>();
+					ent.removeComponent<HealthComponent>();
 					ent.removeComponent<CollisionComponent>();
 					ent.removeComponent<PositionComponent>();
 				});
diff --git a/sources/Runner/PauseMenuScene.cpp b/sources/Runner/PauseMenuScene.cpp
index 7a6d2aa9..6509b3f9 100644
--- a/sources/Runner/PauseMenuScene.cpp
+++ b/sources/Runner/PauseMenuScene.cpp
@@ -1,5 +1,4 @@
 
-#include <memory>
 #include <Wal.hpp>
 #include "Runner.hpp"
 #include <map>
@@ -59,6 +58,10 @@ namespace BBM
 			.addComponent<OnClickComponent>([](WAL::Entity &, WAL::Wal &)
 			{
 				auto &gameScene = gameState.loadedScenes[BBM::GameState::SceneID::GameScene];
+
+				for (WAL::Entity &entity : gameScene->view<TagComponent<"RestartTimer">>())
+					entity.scheduleDeletion();
+
 				for (auto &[entity, controller, _] : gameScene->view<ControllableComponent, HealthComponent>()) {
 					controller.disabled = true;
 					controller.pause = false;
@@ -78,6 +81,7 @@ namespace BBM
 					})
 					.addComponent<PositionComponent>(1920 / 2 - 2 * 30, 1080 / 2, 0)
 					.addComponent<TagComponent<Timer>>()
+					.addComponent<TagComponent<"RestartTimer">>()
 					.addComponent<Drawable2DComponent, RAY2D::Text>("", 60, RAY::Vector2(), ORANGE);
 				gameState.nextScene = BBM::GameState::SceneID::GameScene;
 			});
@@ -86,17 +90,17 @@ namespace BBM
 			.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_save.png")
 			.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
 			{
-				RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
+				auto *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
 
 				texture->use("assets/buttons/button_save.png");
 			})
 			.addComponent<OnHoverComponent>([](WAL::Entity &entity, WAL::Wal &)
 			{
-				RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
+				auto *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
 
 				texture->use("assets/buttons/button_save_hovered.png");
 			})
-			.addComponent<OnClickComponent>([](WAL::Entity &entity, WAL::Wal &wal)
+			.addComponent<OnClickComponent>([](WAL::Entity &, WAL::Wal &wal)
 			{
 				if (!std::filesystem::exists("save"))
 					std::filesystem::create_directories("save");