mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 02:45:32 +00:00
Code Issues Releases Wiki Activity

Add a utility function for counting items in a container

Browse source
This commit is contained in:
scrawl 2014-01-08 22:58:36 +01:00
parent c55f9bd0aa
commit 372cd437d1
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwscript/containerextensions.cpp
View file

@ -87,15 +87,9 @@ namespace MWScript
std::string item = runtime.getStringLiteral (runtime[0].mInteger); std::string item = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr); MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
Interpreter::Type_Integer sum = 0; runtime.push (store.count(item));
for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
if (Misc::StringUtils::ciEqual(iter->getCellRef().mRefID, item))
sum += iter->getRefData().getCount();
runtime.push (sum);
} }
}; };

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

@ -77,6 +77,15 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::end()
return ContainerStoreIterator (this); return ContainerStoreIterator (this);
} }
int MWWorld::ContainerStore::count(const std::string &id)
{
int total=0;
for (MWWorld::ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
if (Misc::StringUtils::ciEqual(iter->getCellRef().mRefID, id))
total += iter->getRefData().getCount();
return total;
}
void MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container) void MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container)
{ {
if (ptr.getRefData().getCount() <= 1) if (ptr.getRefData().getCount() <= 1)

3
apps/openmw/mwworld/containerstore.hpp
View file

@ -92,6 +92,9 @@ namespace MWWorld
void unstack (const Ptr& ptr, const Ptr& container); void unstack (const Ptr& ptr, const Ptr& container);
///< Unstack an item in this container. The item's count will be set to 1, then a new stack will be added with (origCount-1). ///< Unstack an item in this container. The item's count will be set to 1, then a new stack will be added with (origCount-1).
/// @return How many items with refID \a id are in this container?
int count (const std::string& id);
protected: protected:
ContainerStoreIterator addNewStack (const Ptr& ptr, int count); ContainerStoreIterator addNewStack (const Ptr& ptr, int count);
///< Add the item to this container (do not try to stack it onto existing items) ///< Add the item to this container (do not try to stack it onto existing items)