diff --git a/ActiveObject.h b/ActiveObject.h index 3a1c60d..0b3a23a 100644 --- a/ActiveObject.h +++ b/ActiveObject.h @@ -16,7 +16,7 @@ struct ActiveObject { ZL::VertexDataStruct activeObjectScreenMesh; ZL::VertexRenderStruct activeObjectScreenMeshMutable; - std::shared_ptr inventoryItemTexturePtr; + std::shared_ptr inventoryIconTexturePtr; ZL::Vector3f objectPos; bool highlighted = false; diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index ef5bf2f..fd8eb62 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -94,7 +94,7 @@ void GameObjectManager::initialize() { ao1.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5); ao1.activeObjectScreenMeshMutable.AssignFrom(ao1.activeObjectScreenMesh); ao1.activeObjectScreenMeshMutable.RefreshVBO(); - ao1.inventoryItemTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_T_icon.bmp32")); + ao1.inventoryIconTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_T_icon.bmp32")); /* ActiveObject ao2; @@ -260,7 +260,7 @@ void GameObjectManager::handleEvent(const SDL_Event& event) { continue; } - AddItemToInventory(ao->name, ao->inventoryItemTexturePtr, objects_in_inventory+1); + AddItemToInventory(ao->name, ao->inventoryIconTexturePtr, objects_in_inventory+1); objects_in_inventory++; rooms[current_room_index].removeByPtr(ao);