need to merge with develop

This commit is contained in:
EternalRat
2021-06-14 17:53:51 +02:00
parent 19da647448
commit 5086e7ec03
8 changed files with 52 additions and 35 deletions
+3 -1
View File
@@ -40,6 +40,8 @@ namespace RAY2D = RAY::Drawables::Drawables2D;
namespace BBM
{
GameState Runner::gameState;
int Runner::width = 16;
int Runner::height = 16;
void Runner::updateState(WAL::Wal &engine, GameState &state)
{
@@ -49,7 +51,7 @@ namespace BBM
if (gameState.currentScene == GameState::SceneID::GameScene || gameState.currentScene == GameState::SceneID::SplashScreen) {
for (auto &[_, component]: engine.getScene()->view<ControllableComponent>()) {
if (component.pause && gameState.currentScene == GameState::SceneID::GameScene) {
ParserYAML::save(engine.getScene(), "test");
//ParserYAML::save(engine.getScene(), "test");
gameState.nextScene = GameState::SceneID::PauseMenuScene;
break;
} else if (gameState.currentScene == GameState::SceneID::SplashScreen && component.jump) {