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

renamed realAdd to addImp

Browse source
This commit is contained in:
Tom Mason 2013-01-20 14:14:34 +00:00
parent 3c6ddd7fa7
commit 665a530e10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr) MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
{ {
MWWorld::ContainerStoreIterator it = realAdd(ptr); MWWorld::ContainerStoreIterator it = addImp(ptr);
MWWorld::Ptr item = *it; MWWorld::Ptr item = *it;
std::string script = MWWorld::Class::get(item).getScript(item); std::string script = MWWorld::Class::get(item).getScript(item);
@ -97,7 +97,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
return it; return it;
} }
MWWorld::ContainerStoreIterator MWWorld::ContainerStore::realAdd (const Ptr& ptr) MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr)
{ {
int type = getType(ptr); int type = getType(ptr);
@ -189,7 +189,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const MWWor
} }
ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count) ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count)
realAdd (ref.getPtr()); addImp (ref.getPtr());
} }
flagAsModified(); flagAsModified();

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

@ -52,7 +52,7 @@ namespace MWWorld
int mStateId; int mStateId;
mutable float mCachedWeight; mutable float mCachedWeight;
mutable bool mWeightUpToDate; mutable bool mWeightUpToDate;
ContainerStoreIterator realAdd (const Ptr& ptr); ContainerStoreIterator addImp (const Ptr& ptr);
public: public: