mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-16 18:46:36 +00:00
Code Issues Releases Wiki Activity

maintain missing item info in quickkey menu

Browse source
This commit is contained in:
Kuyondo 2025-08-12 19:04:49 +08:00
parent f5d866894e
commit 9426a36f5a
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -16,7 +16,9 @@
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp" #include "../mwworld/inventorystore.hpp"
#include "../mwworld/manualref.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/worldmodel.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"
@ -627,6 +629,14 @@ namespace MWGui
MWWorld::Ptr player = MWMechanics::getPlayer(); MWWorld::Ptr player = MWMechanics::getPlayer();
MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player); MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
MWWorld::CellStore& draftCell = MWBase::Environment::get().getWorldModel()->getDraftCell();
auto assignItem = [this](auto type, MWWorld::Ptr item) {
if (type == ESM::QuickKeys::Type::Item)
onAssignItem(item);
else // if (quickKey.mType == ESM::QuickKeys::Type::MagicItem)
onAssignMagicItem(item);
};
int i = 0; int i = 0;
for (ESM::QuickKeys::QuickKey& quickKey : keys.mKeys) for (ESM::QuickKeys::QuickKey& quickKey : keys.mKeys)
@ -648,16 +658,28 @@ namespace MWGui
{ {
// Find the item by id // Find the item by id
MWWorld::Ptr item = store.findReplacement(quickKey.mId); MWWorld::Ptr item = store.findReplacement(quickKey.mId);
if (item.isEmpty()) if (item.isEmpty())
unassign(mSelected);
else
{ {
if (quickKey.mType == ESM::QuickKeys::Type::Item) unassign(mSelected);
assignItem(item); if (!quickKey.mId.empty())
else // if (quickKey.mType == ESM::QuickKeys::Type::MagicItem) {
onAssignMagicItem(item); // Fallback to a temporary object for UI display purposes
try
{
MWWorld::ManualRef mref(*MWBase::Environment::get().getESMStore(), quickKey.mId);
item = mref.getPtr().getClass().copyToCell(mref.getPtr(), draftCell, 1);
} }
catch (const std::exception& e)
{
break;
}
assignItem(quickKey.mType, item);
MWBase::Environment::get().getWorld()->disable(item);
MWBase::Environment::get().getWorld()->deleteObject(item);
}
}
else
assignItem(quickKey.mType, item);
break; break;
} }