added timer
This commit is contained in:
parent
32b2acf739
commit
6c576510b7
@ -170,7 +170,7 @@ void GameObjectManager::initialize() {
|
|||||||
objects_in_inventory++;
|
objects_in_inventory++;
|
||||||
AddItemToInventory("cube_O", std::make_shared<Texture>(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_O_icon.bmp32")), objects_in_inventory + 1);
|
AddItemToInventory("cube_O", std::make_shared<Texture>(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_O_icon.bmp32")), objects_in_inventory + 1);
|
||||||
objects_in_inventory++;
|
objects_in_inventory++;
|
||||||
AddItemToInventory("cube_M", std::make_shared<Texture>(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_O_icon.bmp32")), objects_in_inventory + 1);
|
AddItemToInventory("cube_M", std::make_shared<Texture>(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_M_icon.bmp32")), objects_in_inventory + 1);
|
||||||
objects_in_inventory++;
|
objects_in_inventory++;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -11,13 +11,14 @@ namespace ZL
|
|||||||
|
|
||||||
std::function<void(GameObjectManager&, size_t)> createRoom1Logic()
|
std::function<void(GameObjectManager&, size_t)> createRoom1Logic()
|
||||||
{
|
{
|
||||||
return [](GameObjectManager& gom, size_t ms)
|
return [elapsedTime = 0u](GameObjectManager& gom, size_t ms) mutable
|
||||||
{
|
{
|
||||||
if (gom.bearName.compare("TOM") == 0) {
|
if (gom.bearName.compare("TOM") == 0) {
|
||||||
gInventoryMap.clear();
|
elapsedTime += ms;
|
||||||
gom.objects_in_inventory = 0;
|
if (elapsedTime >= 2000) {
|
||||||
// std::this_thread::sleep_for(std::chrono::seconds(1));
|
gInventoryMap.clear();
|
||||||
gom.switch_room(1);
|
gom.switch_room(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
textures/inventory_objects/cubic_M_icon.bmp32
Normal file
BIN
textures/inventory_objects/cubic_M_icon.bmp32
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 449 KiB |
Loading…
Reference in New Issue
Block a user