From cec8229b914dab61a1380e5e0dc35be3ae29693e Mon Sep 17 00:00:00 2001 From: almiche Date: Thu, 15 Aug 2019 23:18:48 -0400 Subject: [PATCH] Last commit <3 --- Source/EventManager.cpp | 4 ++-- Source/EventManager.h | 2 -- Source/World.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/EventManager.cpp b/Source/EventManager.cpp index 6ac5db5..5c23681 100644 --- a/Source/EventManager.cpp +++ b/Source/EventManager.cpp @@ -244,8 +244,8 @@ void EventManager::Update() if (GetApplicationState() == ApplicationState::RUNNING) AppInfoWindow::Draw(GetPlanetClickedMessage()); // Draw FPS window when done loading - if (!GetLoadingState()) - AppInfoWindow::Draw(GetPlanetClickedMessage()); + if (GetApplicationState() == ApplicationState::RUNNING) + AppInfoWindow::Draw(GetPlanetClickedMessage()); // Rendering ImGui ImGui::Render(); diff --git a/Source/EventManager.h b/Source/EventManager.h index 9ba7261..1759240 100644 --- a/Source/EventManager.h +++ b/Source/EventManager.h @@ -31,8 +31,6 @@ class EventManager static void Shutdown(); static void SetApplicationState(ApplicationState state); static ApplicationState GetApplicationState(); - static void SetLoadingState(bool state); - static bool GetLoadingState(); static void SetPlanetClicked(std::string message); static std::string GetPlanetClickedMessage(); diff --git a/Source/World.h b/Source/World.h index aa3b836..157398a 100644 --- a/Source/World.h +++ b/Source/World.h @@ -46,8 +46,6 @@ class World ApplicationState GetApplicationState(); void SetApplicationState(ApplicationState state); - bool GetLoadingState(); - void SetLoadingState(bool state); std::string GetPlanetClicked(); void SetPlanetClicked(std::string message); int NumberOfPlanetsToGenerate();