mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix an error in restocking logic (Fixes #3131)

Browse Source
This commit is contained in:
scrawl 2016-01-12 17:10:23 +01:00
parent fde831e2e0
commit 471ad3fb0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwworld/containerstore.cpp
View File

@ -529,10 +529,10 @@ void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MW
{ {
std::map<std::string, int>::iterator listInMap = allowedForReplace.find(itemOrList); std::map<std::string, int>::iterator listInMap = allowedForReplace.find(itemOrList);
int restockNum = it->mCount; int restockNum = std::abs(it->mCount);
//If we know we must restock less, take it into account //If we know we must restock less, take it into account
if(listInMap != allowedForReplace.end()) if(listInMap != allowedForReplace.end())
restockNum += listInMap->second;//We add, because list items have negative count restockNum -= std::min(restockNum, listInMap->second);
//restock //restock
addInitialItem(itemOrList, owner, restockNum, true); addInitialItem(itemOrList, owner, restockNum, true);
} }