diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index 5a6b25e..7aceffc 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -170,7 +170,7 @@ void GameObjectManager::initialize() { objects_in_inventory++; AddItemToInventory("cube_O", std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_O_icon.bmp32")), objects_in_inventory + 1); objects_in_inventory++; - AddItemToInventory("cube_M", std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_O_icon.bmp32")), objects_in_inventory + 1); + AddItemToInventory("cube_M", std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_M_icon.bmp32")), objects_in_inventory + 1); objects_in_inventory++; diff --git a/QuestScripts.cpp b/QuestScripts.cpp index cbb289d..31fa8d7 100644 --- a/QuestScripts.cpp +++ b/QuestScripts.cpp @@ -11,13 +11,14 @@ namespace ZL std::function createRoom1Logic() { - return [](GameObjectManager& gom, size_t ms) + return [elapsedTime = 0u](GameObjectManager& gom, size_t ms) mutable { if (gom.bearName.compare("TOM") == 0) { - gInventoryMap.clear(); - gom.objects_in_inventory = 0; -// std::this_thread::sleep_for(std::chrono::seconds(1)); - gom.switch_room(1); + elapsedTime += ms; + if (elapsedTime >= 2000) { + gInventoryMap.clear(); + gom.switch_room(1); + } } }; } diff --git a/textures/inventory_objects/cubic_M_icon.bmp32 b/textures/inventory_objects/cubic_M_icon.bmp32 new file mode 100644 index 0000000..2d6426f Binary files /dev/null and b/textures/inventory_objects/cubic_M_icon.bmp32 differ