From c0f77dd32ae28753546ef71e2cc827cfc14da974 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Fri, 25 Sep 2015 03:10:47 +0200
Subject: [PATCH] fixup! Merge branch 'master' of
 github.com:teamfisk/AgileBreakOut

---
 include/Core/Engine.h       | 10 +++-------
 include/Game/MainMenuMain.h |  3 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index 5886f2f..1a0932e 100644
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -338,14 +338,10 @@ public:
 		if (m_GameIsRunning) {
 			m_World->Update(dt);
 		}
-		if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_ENTER)) {
-			Events::GameStart e;
-			m_EventBroker->Publish(e);
-		}
-		if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {
-			ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl");
-		}
+		m_EventBroker->Process<GUI::Frame>();
+		m_FrameStack->UpdateLayered(dt);
 
+		m_FrameStack->DrawLayered(m_RendererQueue);
 		//TODO Fill up the renderQueue with models (Temp fix)
 		if (m_GameIsRunning) {
 			TEMPAddToRenderQueue();
diff --git a/include/Game/MainMenuMain.h b/include/Game/MainMenuMain.h
index fb0f2fe..24296ed 100644
--- a/include/Game/MainMenuMain.h
+++ b/include/Game/MainMenuMain.h
@@ -3,6 +3,7 @@
 
 #include "GUI/TextureFrame.h"
 #include "GUI/Button.h"
+#include "Game/EGameStart.h"
 
 namespace dd
 {
@@ -55,6 +56,8 @@ private:
 	virtual bool OnButtonRelease(const Events::ButtonRelease& event)
 	{
 		if (event.Button == m_SquidoutButton) {
+			Events::GameStart e;
+			EventBroker->Publish(e);
 			m_Parent->Hide();
 		}