zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-30 09:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from develop

Browse Source
This commit is contained in:
arthur.jamet
2021-06-16 17:37:23 +02:00
parent b1720ffd79 bd821b4dab
commit 2956f7519f
19 changed files with 151 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/MenuControllable/MenuControllableSystem.cpp
+2 -2
View File
@@ -94,8 +94,8 @@ namespace BBM
if (!this->_currentButton)
return;
for (auto &[_, controllable]: controllableView)
if (controllable.move.x || controllable.move.y || controllable.jump) {
this->_updateCurrentButton(controllable.jump, controllable.move);
if (controllable.move.x || controllable.move.y || controllable.select) {
this->_updateCurrentButton(controllable.select, controllable.move);
return;
}
for (auto &entity: buttons) {