Merge pull request #261 from AnonymusRaccoon/develop

Develop
zoriya · Jun 20, 2021 · 2d17eff · 2d17eff
2 parents d8cf9a9 + 5481f96
commit 2d17eff
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/sources/Component/Controllable/ControllableComponent.cpp b/sources/Component/Controllable/ControllableComponent.cpp
@@ -20,4 +20,12 @@ namespace BBM
 		: WAL::Component(entity),
 		disabled(isDisabled)
 	{}
+
+	void ControllableComponent::disable()
+	{
+		this->disabled = true;
+		this->pause = false;
+		this->bomb = false;
+		this->move = Vector2f();
+	}
 }
diff --git a/sources/Component/Controllable/ControllableComponent.hpp b/sources/Component/Controllable/ControllableComponent.hpp
@@ -45,6 +45,8 @@ namespace BBM
 			//! @brief True if buttons should be triggered every frame where the key is down, false if the button should only be triggered once the key is released.
 			bool fastClick = false;
 
+			void disable();
+
 			//! @inherit
 			WAL::Component *clone(WAL::Entity &entity) const override;
 

diff --git a/sources/Runner/GameScene.cpp b/sources/Runner/GameScene.cpp
@@ -121,7 +121,7 @@ namespace BBM
 					entity.removeComponent<AnimatorComponent>();
 				if (entity.hasComponent<TimerComponent>())
 					return;
-				entity.getComponent<ControllableComponent>().disabled = true;
+				entity.getComponent<ControllableComponent>().disable();
 				entity.addComponent<TimerComponent>(1s, [](WAL::Entity &ent, WAL::Wal &) {
 					if (!ent.hasComponent<SoundComponent>())
 						return;

diff --git a/sources/Runner/PauseMenuScene.cpp b/sources/Runner/PauseMenuScene.cpp
@@ -63,9 +63,7 @@ namespace BBM
 					entity.scheduleDeletion();
 
 				for (auto &[entity, controller, _] : gameScene->view<ControllableComponent, HealthComponent>()) {
-					controller.disabled = true;
-					controller.pause = false;
-					controller.bomb = false;
+					controller.disable();
 				}
 				for (auto &[_, timer] : gameScene->view<TimerComponent>())
 					timer.disabled = true;