zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-06 06:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #261 from AnonymusRaccoon/develop

Browse Source 
Develop
This commit is contained in:
Clément Le Bihan
2021-06-20 19:29:34 +02:00
committed by GitHub
parent d8cf9a9a4c 5481f96e9b
commit 2d17eff485
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/Component/Controllable/ControllableComponent.cpp
View File

@@ -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();
}
}

2
sources/Component/Controllable/ControllableComponent.hpp
View File

@@ -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;

2
sources/Runner/GameScene.cpp
View File

@@ -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;

4
sources/Runner/PauseMenuScene.cpp
View File

@@ -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;