Merge pull request #23 from mephi1984/pavel

fixed freezing in second scene

GameObjectManager.cpp

@@ -92,7 +92,7 @@ void GameObjectManager::initialize() {
     Room room_2;
     room_2.roomTexture = std::make_shared<Texture>(CreateTextureDataFromBmp24("./background.bmp"));
     room_2.sound_name = "Symphony No.6 (1st movement).ogg";
-    room_2.roomLogic = createRoom1Logic();
+    room_2.roomLogic = createRoom2Logic();
     rooms.push_back(room_2);
 
     activeObjects = rooms[current_room_index].objects;

QuestScripts.cpp

@@ -19,4 +19,13 @@ namespace ZL
         };
     }
 
+    std::function<void(GameObjectManager&, size_t)> createRoom2Logic()
+    {
+        return [](GameObjectManager& gom, size_t ms)
+//      Simple test logic
+        {
+
+        };
+    }
+
 }

QuestScripts.h

@@ -5,5 +5,6 @@ namespace ZL {
     class GameObjectManager;
 
     std::function<void(GameObjectManager&, size_t)> createRoom1Logic();
+    std::function<void(GameObjectManager&, size_t)> createRoom2Logic();
 
 }