zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-05 02:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sources/Runner/GameScene.cpp
#	sources/Runner/LobbyScene.cpp
This commit is contained in:
Clément Le Bihan
2021-06-16 16:33:08 +02:00
parent 58995af526 bd821b4dab
commit a3c908dacc
19 changed files with 209 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Runner/Runner.cpp
+2 -1
View File
@@ -44,6 +44,7 @@
namespace BBM
{
GameState Runner::gameState;
bool Runner::hasHeights = false;
void Runner::updateState(WAL::Wal &engine, GameState &state)
{
@@ -55,7 +56,7 @@ namespace BBM
if (component.pause && gameState.currentScene == GameState::SceneID::GameScene) {
gameState.nextScene = GameState::SceneID::PauseMenuScene;
break;
} else if (gameState.currentScene == GameState::SceneID::SplashScreen && component.jump) {
} else if (gameState.currentScene == GameState::SceneID::SplashScreen && component.select) {
gameState.nextScene = GameState::SceneID::TitleScreenScene;
break;
}