diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index 3a089c6..81e5914 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -92,7 +92,7 @@ void GameObjectManager::initialize() { Room room_2; room_2.roomTexture = std::make_shared(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; diff --git a/QuestScripts.cpp b/QuestScripts.cpp index 321a6ff..7f9a009 100644 --- a/QuestScripts.cpp +++ b/QuestScripts.cpp @@ -19,4 +19,13 @@ namespace ZL }; } + std::function createRoom2Logic() + { + return [](GameObjectManager& gom, size_t ms) +// Simple test logic + { + + }; + } + } diff --git a/QuestScripts.h b/QuestScripts.h index bf7205b..dcdd1d0 100644 --- a/QuestScripts.h +++ b/QuestScripts.h @@ -5,5 +5,6 @@ namespace ZL { class GameObjectManager; std::function createRoom1Logic(); + std::function createRoom2Logic(); }