Merge branch 'game-registration-fix' into dev

include/Game.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <optional>
+#include <string>
+
 class GameInternal;
 
 // TODO: add managers here

include/GameFactory.h

@@ -1,10 +1,7 @@
 #pragma once
 
 #include <cassert>
-#include <iostream>
-#include <map>
 #include <functional>
-#include <string>
 #include <stdexcept>
 
 #include "Game.h"

include/GameRegistrar.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "GameFactory.h"
+
+namespace vego {
+    template<typename GameType>
+    struct GameRegistrar {
+        GameRegistrar() {
+            static_assert(std::is_base_of<Game, GameType>::value, "Your class must inherit from Game");
+            GameFactory::instance().registerClass([]() { return new GameType(); });
+        }
+    };
+}

include/GameRegistryHelper.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include "GameFactory.h"
-
-namespace vego {
-	template<typename T>
-	class GameRegistryHelper {
-	public:
-    	[[deprecated("GameRegistryHelper() does not take a className anymore")]]
-		GameRegistryHelper(const std::string& className) {
-			static_assert(std::is_base_of<Game, T>::value, "Your class must inherit from Game");
-			GameFactory::instance().registerClass(
-				[]() -> Game* { return new T; }
-			);
-		};
-		
-		GameRegistryHelper() {
-			static_assert(std::is_base_of<Game, T>::value, "Your class must inherit from Game");
-			GameFactory::instance().registerClass(
-				[]() -> Game* { return new T; }
-			);
-		};	
-	};
-}