Merge branch 'master' into Physics

include/Core/Engine.h

@@ -80,7 +80,6 @@ public:
 		m_FrameStack = new GUI::Frame(m_EventBroker.get());
 		m_FrameStack->Width = 675;
 		m_FrameStack->Height = 1080;
-		auto hud = new GUI::HUD(m_FrameStack, "HUD");
 		auto menu = new GUI::MainMenu(m_FrameStack, "MainMenu");
 
 		m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker);

include/GUI/NumberFrame.h

@@ -24,7 +24,6 @@ public:
 		m_NumberTextures[7] = "Textures/GUI/Numbers/N7.png";
 		m_NumberTextures[8] = "Textures/GUI/Numbers/N8.png";
 		m_NumberTextures[9] = "Textures/GUI/Numbers/N9.png";
-		SetNumber(0);
 
 		// Create number frame if missing
 		for (int i = 0; i < 10; i++) {
@@ -41,6 +40,8 @@ public:
 			}
 			m_NumberFrames.push_front(frame);
 		}
+
+		SetNumber(0);
 	}
 
 	int Number() const { return m_Number; }

include/Game/HUD.h

@@ -43,7 +43,7 @@ private:
 
 	bool OnScore(const Events::ScoreEvent& event)
 	{
-		m_ScoreNumberFrame->SetNumber(event.Score);
+		m_ScoreNumberFrame->SetNumber(m_ScoreNumberFrame->Number() + event.Score);
 	}
 };
 

include/Game/MainMenuMain.h

@@ -4,6 +4,7 @@
 #include "GUI/TextureFrame.h"
 #include "GUI/Button.h"
 #include "Game/EGameStart.h"
+#include "Game/HUD.h"
 
 namespace dd
 {
@@ -59,6 +60,7 @@ private:
 			Events::GameStart e;
 			EventBroker->Publish(e);
 			m_Parent->Hide();
+			auto hud = new GUI::HUD(BaseFrame, "HUD");
 		}
 
 		return true;

tools/StyleGuide.h

@@ -1,6 +1,12 @@
 #ifndef NAMESPACE_FILENAME_H__
 #define NAMESPACE_FILENAME_H__
 
+#include <standard_library>
+
+#include <external_dependency>
+
+#include "Internal/Header.h"
+
 namespace dd
 {