krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Use the new ContainerStore::remove method.

Browse source
This commit is contained in:
scrawl 2013-11-12 01:26:16 +01:00
parent ffdb91bb21
commit 5f209b120b
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwworld/worldimp.cpp
View file

@ -2127,20 +2127,18 @@ namespace MWWorld
} }
if (enchantment->mData.mType == ESM::Enchantment::CastOnce) if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
{ {
item.getRefData().setCount(item.getRefData().getCount()-1); if (!item.getContainerStore()->remove(item, 1, actor))
} {
// Item was used up
sourceName = item.getClass().getName(item); MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
inv.setSelectedEnchantItem(inv.end());
if (!item.getRefData().getCount()) }
{
// Item was used up
MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
inv.setSelectedEnchantItem(inv.end());
} }
else else
MWBase::Environment::get().getWindowManager()->setSelectedEnchantItem(item); // Set again to show the modified charge MWBase::Environment::get().getWindowManager()->setSelectedEnchantItem(item); // Set again to show the modified charge
sourceName = item.getClass().getName(item);
effects = enchantment->mEffects; effects = enchantment->mEffects;
} }