From ca645e20267b3f48fb76718808cde7d0f11d9484 Mon Sep 17 00:00:00 2001 From: WiggleWizard <1405402+WiggleWizard@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:48:14 +0100 Subject: [PATCH] Fixed a few things --- Nuake/Engine.cpp | 7 ++----- Nuake/src/Subsystems/EngineSubsystem.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Nuake/Engine.cpp b/Nuake/Engine.cpp index 6465b58e..52e4b895 100644 --- a/Nuake/Engine.cpp +++ b/Nuake/Engine.cpp @@ -142,8 +142,6 @@ namespace Nuake void Engine::EnterPlayMode() { - SetGameState(GameState::Loading); - lastFrameTime = (float)glfwGetTime(); // Reset timestep timer. // Dont trigger init if already in player mode. @@ -152,6 +150,8 @@ namespace Nuake Logger::Log("Cannot enter play mode if is already in play mode or is loading.", "engine", WARNING); return; } + + SetGameState(GameState::Loading); PhysicsManager::Get().ReInit(); @@ -163,9 +163,6 @@ namespace Nuake { Logger::Log("Cannot enter play mode. Scene OnInit failed", "engine", CRITICAL); GetCurrentScene()->OnExit(); - - // Precautionary measure - SetGameState(GameState::Stopped); } } diff --git a/Nuake/src/Subsystems/EngineSubsystem.h b/Nuake/src/Subsystems/EngineSubsystem.h index 9dbc228c..f1c25b30 100644 --- a/Nuake/src/Subsystems/EngineSubsystem.h +++ b/Nuake/src/Subsystems/EngineSubsystem.h @@ -16,6 +16,6 @@ namespace Nuake virtual void Tick(float deltaTime) {} private: - bool canEverTick = true; + bool canEverTick = false; }; }