mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 21:45:32 +00:00
Code Issues Releases Wiki Activity

add string vectors for name/id in QuickKeysMenu for item lookups

Browse source
This commit is contained in:
Finbar Crago 2018-06-25 16:02:28 +10:00
parent da4c55d5ad
commit 46c6abcf54
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,9 @@ namespace MWGui
mAssigned.push_back(Type_Unassigned);
mAssignedId.push_back(std::string(""));
mAssignedName.push_back(std::string(""));
unassign(button, i);
}
}
@ -131,6 +134,9 @@ namespace MWGui
mRefItemContainer.remove(refItem.getCellRef().getRefId(), 1, MWMechanics::getPlayer());
}
mAssignedName[index] = "";
mAssignedId[index] = "";
key->clearUserStrings();
key->setItem(MWWorld::Ptr());
while (key->getChildCount()) // Destroy number label
@ -227,12 +233,14 @@ namespace MWGui
MyGUI::Gui::getInstance().destroyWidget(button->getChildAt(0));
mAssigned[mSelectedIndex] = Type_Item;
mAssignedId[mSelectedIndex] = item.getCellRef().getRefId();
mAssignedName[mSelectedIndex] = item.getClass().getName(item);
MWWorld::Ptr itemCopy = *mRefItemContainer.add(item, 1, MWMechanics::getPlayer());
MWWorld::Ptr refItem = *mRefItemContainer.add(item, 1, MWMechanics::getPlayer());
button->setItem(itemCopy, ItemWidget::Barter);
button->setItem(refItem, ItemWidget::Barter);
button->setUserString ("ToolTipType", "ItemPtr");
button->setUserData(itemCopy);
button->setUserData(item);
if (mItemSelectionDialog)
mItemSelectionDialog->setVisible(false);
@ -343,18 +351,26 @@ namespace MWGui
if (type == Type_Item || type == Type_MagicItem)
{
MWWorld::Ptr refItem = *button->getUserData<MWWorld::Ptr>();
MWWorld::Ptr item = store.findReplacement(refItem.getCellRef().getRefId());
MWWorld::Ptr item = *button->getUserData<MWWorld::Ptr>();
MWWorld::ContainerStoreIterator it = store.begin();
for (; it != store.end(); ++it)
{
if (*it == item)
break;
}
if (it == store.end())
item = NULL;
// check the item is available and not broken
if (!item || item.getRefData().getCount() < 1 ||
(item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
{
item = store.findReplacement(mAssignedId[index-1]);
if (!item || item.getRefData().getCount() < 1)
{
// item not in plater inventory found
MWBase::Environment::get().getWindowManager()->messageBox(
"#{sQuickMenu5} " + refItem.getClass().getName(refItem));
"#{sQuickMenu5} " + mAssignedName[index-1]);
return;
}
@ -389,17 +405,6 @@ namespace MWGui
}
else if (type == Type_MagicItem)
{
// retrieve ContainerStoreIterator to the item
MWWorld::ContainerStoreIterator it = store.begin();
for (; it != store.end(); ++it)
{
if (*it == item)
{
break;
}
}
assert(it != store.end());
// equip, if it can be equipped
if (!item.getClass().getEquipmentSlots(item).first.empty())
{

2
apps/openmw/mwgui/quickkeysmenu.hpp
View file

@ -60,6 +60,8 @@ namespace MWGui
MyGUI::Button* mOkButton;
MWWorld::ContainerStore mRefItemContainer;
std::vector<std::string> mAssignedId;
std::vector<std::string> mAssignedName;
std::vector<ItemWidget*> mQuickKeyButtons;
std::vector<QuickKeyType> mAssigned;