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

# 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
34 changed files with 219 additions and 165 deletions

View File

@@ -34,14 +34,16 @@ namespace BBM
//! @brief The X and Z abscis of the movement.
Vector2f move;
//! @brief input value to select
bool select = false;
//! @brief input value for bomb
//! @brief input value for secondary inputs.
bool secondary = false;
//! @brief input value for bomb and selection
bool bomb = false;
//! @brief input value for pause
bool pause = false;
//! @brief The layout used for this controllable.
Layout layout = NONE;
//! @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;
//! @inherit
WAL::Component *clone(WAL::Entity &entity) const override;