mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 22:11:33 +00:00
Code Issues Releases Wiki Activity

Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit

Browse source
This commit is contained in:
Ragora 2014-09-13 18:48:41 -04:00
parent d4007ad89e
commit f250e3df4b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/companionwindow.cpp
View file

@ -51,7 +51,7 @@ void CompanionWindow::onItemSelected(int index)
const ItemStack& item = mSortModel->getItem(index); const ItemStack& item = mSortModel->getItem(index);
// We can't take conjured items from a companion NPC // We can't take conjured items from a companion NPC
if (item.mBase.getCellRef().getRefId().size() > 6 && item.mBase.getCellRef().getRefId().substr(0,6) == "bound_") if (item.mFlags & ItemStack::Flag_Bound)
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
return; return;

4
apps/openmw/mwgui/container.cpp
View file

@ -114,7 +114,7 @@ namespace MWGui
MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0); MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
// We can't drop a conjured item to the ground; the target container should always be the source container // We can't drop a conjured item to the ground; the target container should always be the source container
if (mItem.mBase.getCellRef().getRefId().size() > 6 && mItem.mBase.getCellRef().getRefId().substr(0,6) == "bound_" && targetModel != mSourceModel) if (mItem.mFlags & ItemStack::Flag_Bound && targetModel != mSourceModel)
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
return; return;
@ -184,7 +184,7 @@ namespace MWGui
const ItemStack& item = mSortModel->getItem(index); const ItemStack& item = mSortModel->getItem(index);
// We can't take a conjured item from a container (some NPC we're pickpocketing, a box, etc) // We can't take a conjured item from a container (some NPC we're pickpocketing, a box, etc)
if (item.mBase.getCellRef().getRefId().size() > 6 && item.mBase.getCellRef().getRefId().substr(0,6) == "bound_") if (item.mFlags & ItemStack::Flag_Bound)
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage1}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage1}");
return; return;

4
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -189,8 +189,8 @@ namespace MWGui
if (mTrading) if (mTrading)
{ {
// Can't give cojured items to a merchant // Can't give conjured items to a merchant
if (item.mBase.getCellRef().getRefId().size() > 6 && item.mBase.getCellRef().getRefId().substr(0,6) == "bound_") if (item.mFlags & ItemStack::Flag_Bound)
{ {
MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0); MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog9}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog9}");