diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index 9ead919..4a5397f 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -175,7 +175,7 @@ void GameObjectManager::initialize() { ActiveObject lock; - lock.name = "lock"; + lock.name = "lockFriend"; lock.activeObjectMesh = ZL::LoadFromTextFile("./lock.txt"); // Add ZL:: namespace lock.activeObjectMesh.Scale(2); lock.activeObjectMeshMutable.AssignFrom(lock.activeObjectMesh); @@ -191,7 +191,7 @@ void GameObjectManager::initialize() { ActiveObject door; - door.name = "door"; + door.name = "doorGlory"; door.activeObjectMesh = ZL::LoadFromTextFile("./door.txt"); // Add ZL:: namespace door.activeObjectMesh.Scale(60); // cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5))); @@ -256,7 +256,7 @@ void GameObjectManager::initialize() { room_3.sound_name = "unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg"; room_3.objects.push_back(lock); room_3.objects.push_back(door); - room_3.roomLogic = null; + room_3.roomLogic = createRoom3Logic(); room_3.textMesh = preloadedRoomMeshArr[2]; room_3.textMeshMutable.AssignFrom(room_3.textMesh); room_3.collisionMgr.setRoomBoundary(790, 790); diff --git a/QuestScripts.cpp b/QuestScripts.cpp index 7ca107a..a45b581 100644 --- a/QuestScripts.cpp +++ b/QuestScripts.cpp @@ -44,4 +44,14 @@ namespace ZL }; } + + std::function createRoom3Logic() + { + return [](GameObjectManager& gom, size_t ms) +// Simple test logic + { + + }; + } + } diff --git a/QuestScripts.h b/QuestScripts.h index dcdd1d0..29d001a 100644 --- a/QuestScripts.h +++ b/QuestScripts.h @@ -6,5 +6,6 @@ namespace ZL { std::function createRoom1Logic(); std::function createRoom2Logic(); + std::function createRoom3Logic(); }