AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-27 15:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

implemented item count

Browse Source
This commit is contained in:
Marc Zinnschlag 2010-08-04 14:04:22 +02:00
parent 7ba6bdb56c
commit e0a3b1b1db
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw/mwrender/cellimp.cpp
View File

@ -61,11 +61,12 @@ void insertObj(CellRenderImp& cellRender, ESMS::LiveCellRef<ESM::NPC, MWWorld::R
template<typename T>
void insertCellRefList (CellRenderImp& cellRender, const ESMS::ESMStore& store, T& cellRefList)
{
for(typename T::List::iterator it = cellRefList.list.begin();
it != cellRefList.list.end(); it++)
{
insertObj (cellRender, *it, store);
}
for(typename T::List::iterator it = cellRefList.list.begin();
it != cellRefList.list.end(); it++)
{
if (it->mData.getCount())
insertObj (cellRender, *it, store);
}
}
void CellRenderImp::insertCell(ESMS::CellStore<MWWorld::RefData> &cell, const ESMS::ESMStore& store)
@ -92,5 +93,3 @@ void CellRenderImp::insertCell(ESMS::CellStore<MWWorld::RefData> &cell, const ES
insertCellRefList (*this, store, cell.statics);
insertCellRefList (*this, store, cell.weapons);
}

13
apps/openmw/mwworld/refdata.hpp
View File

@ -28,6 +28,7 @@ namespace MWWorld
// we can make this a pointer later.
bool mHasLocals;
bool mEnabled;
int mCount; // 0: deleted
// we are using shared pointer here to avoid having to create custom copy-constructor,
// assignment operator and destructor. As a consequence though copying a RefData object
@ -37,13 +38,18 @@ namespace MWWorld
public:
RefData() : mHasLocals (false), mEnabled (true) {}
RefData() : mHasLocals (false), mEnabled (true), mCount (1) {}
std::string getHandle()
{
return mHandle;
}
int getCount() const
{
return mCount;
}
void setLocals (const ESM::Script& script)
{
if (!mHasLocals)
@ -58,6 +64,11 @@ namespace MWWorld
mHandle = handle;
}
void setCount (int count)
{
mCount = count;
}
MWScript::Locals& getLocals()
{
return mLocals;

2
apps/openmw/mwworld/world.cpp
View File

@ -25,7 +25,7 @@ namespace
cellRefList.list.begin());
iter!=cellRefList.list.end(); ++iter)
{
if (!iter->base->script.empty())
if (!iter->base->script.empty() && iter->mData.getCount())
{
if (const ESM::Script *script = store.scripts.find (iter->base->script))
{