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

Merging with develop

Browse Source
This commit is contained in:
Zoe Roux
2021-06-09 17:07:14 +02:00
parent 52bd28a830 63ca018edf
commit 7a641835a6
127 changed files with 5288 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/System/MenuControllable/MenuControllableSystem.cpp
View File

@@ -41,7 +41,7 @@ namespace BBM
{
auto lastTick = std::chrono::steady_clock::now();
auto &controllable = entity.get<ControllableComponent>();
auto &buttons = _wal.scene->view<OnClickComponent, OnHoverComponent, OnIdleComponent>();
auto &buttons = _wal.getScene()->view<OnClickComponent, OnHoverComponent, OnIdleComponent>();
if (lastTick - this->_now < std::chrono::milliseconds(100))
return;
@@ -49,7 +49,7 @@ namespace BBM
move = controllable.move;
select = controllable.jump;
if (currentButton && currentButton->_scene.getID() != wal.scene->getID()) {
if (currentButton && currentButton->_scene.getID() != wal.getScene()->getID()) {
currentButton->getComponent<OnIdleComponent>().onEvent(*this->currentButton, wal);
currentButton = nullptr;
}