zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-03 18:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser

Browse Source 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Runner/GameScene.cpp
#	sources/Runner/PauseMenuScene.cpp
#	sources/Runner/Runner.cpp
#	sources/System/Controllable/ControllableSystem.cpp
#	sources/System/Lobby/LobbySystem.cpp
This commit is contained in:
Clément Le Bihan
2021-06-19 14:39:43 +02:00
parent 8dc7e2b560 2d2055a86b
commit d8396337dd
34 changed files with 219 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/Timer/TimerSystem.cpp
+5
View File
@@ -17,8 +17,13 @@ namespace BBM
void TimerSystem::onUpdate(WAL::ViewEntity<TimerComponent> &entity, std::chrono::nanoseconds dtime)
{
auto &timer = entity.get<TimerComponent>();
if (timer.disabled)
return;
timer.ringIn -= dtime;
if (timer.ringIn <= 0ns) {
timer.disabled = true;
timer.callback(entity, this->_wal);
}
}