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

type

Browse source
This commit is contained in:
scrawl 2012-05-12 16:30:27 +02:00
parent 5b0251b09f
commit 9f2595183b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,9 +47,11 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::end()
void MWWorld::ContainerStore::add (const Ptr& ptr)
{
int type = getType(ptr);
// determine whether to stack or not
// item stacking depends on owner, script, enchantment and name
for (MWWorld::ContainerStoreIterator iter (begin(getType(ptr))); iter!=end(); ++iter)
for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
{
if ( iter->mCellRef->refID == ptr.mCellRef->refID
&& MWWorld::Class::get(*iter).getScript(*iter) == MWWorld::Class::get(ptr).getScript(ptr)
@ -64,7 +66,7 @@ void MWWorld::ContainerStore::add (const Ptr& ptr)
}
}
switch (getType (ptr))
switch (type)
{
case Type_Potion: potions.list.push_back (*ptr.get<ESM::Potion>()); break;
case Type_Apparatus: appas.list.push_back (*ptr.get<ESM::Apparatus>()); break;