mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-16 07:20:54 +00:00
Code Issues Projects 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();