Merge 247d6cc173536c8d27c0bd75f3a72ce83e22133f into 58e2bb0d304d961260b9d2d2b8b4d800734aa111

include/GameFactory.h

@@ -31,20 +31,23 @@ public:
         return game;
     }*/
 
-    void registerClass(CreateFunc createFunc) {
+    void registerClass(const std::string& className, CreateFunc createFunc) {
-        this->creatorFunc = createFunc;
+        this->creators[className] = createFunc;
     }
 
-    Game* create(GameInternal* gameInternal) {
+    Game* create(const std::string& className, GameInternal* gameInternal) {
-        if (this->creatorFunc == nullptr)
+        auto it = this->creators.find(className);
-            return nullptr;
+        if (it != creators.end()) {
-        Game* game = (this->creatorFunc)();
+            Game* game = it->second();
             game->gameInternal = gameInternal;
             return game;
         }
+        return nullptr;
+    }
 
 private:
-    CreateFunc creatorFunc = nullptr;
+    CreateFunc creator;
+    std::map<std::string, CreateFunc> creators;
 };
 
 /*

include/GameRegistryHelper.h

@@ -6,17 +6,10 @@ 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; }
+				className,
-			);
-		};
-		
-		GameRegistryHelper() {
-			static_assert(std::is_base_of<Game, T>::value, "Your class must inherit from Game");
-			GameFactory::instance().registerClass(
 				[]() -> Game* { return new T; }
 			);
 		};	

src/GameInternal.cpp

@@ -179,7 +179,7 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he
 	// player2.addComponent<StatEffectsComponent>();
 	// player2.addGroup((size_t) Entity::GroupLabel::PLAYERS);
 
-	this->gameInstance = GameFactory::instance().create(this);
+	this->gameInstance = GameFactory::instance().create("Chickengame", this); //!< \todo Should be specified via a config file
 	this->gameInstance->init();
 }