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

Fix "removeitem gold_100" behavior

Browse source
This commit is contained in:
Koncord 2015-07-20 09:53:08 +09:00
parent aefcd1ad07
commit 9485aa5e44
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwworld/containerstore.cpp
View file

@ -362,8 +362,18 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
{
int toRemove = count;
std::string id = itemId;
if(Misc::StringUtils::ciEqual(itemId, "gold_005")
|| Misc::StringUtils::ciEqual(itemId, "gold_010")
|| Misc::StringUtils::ciEqual(itemId, "gold_025")
|| Misc::StringUtils::ciEqual(itemId, "gold_100"))
{
id = MWWorld::ContainerStore::sGoldId;
}
for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter)
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), itemId))
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), id))
toRemove -= remove(*iter, toRemove, actor);
flagAsModified();