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

Remove potential memory leak.

Browse source
This commit is contained in:
cc9cii 2015-03-11 10:49:21 +11:00
parent 43ec933b7b
commit 28259f914c
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/opencs/model/world/record.hpp
View file

@ -40,6 +40,13 @@ namespace CSMWorld
ESXRecordT mBase; ESXRecordT mBase;
ESXRecordT mModified; ESXRecordT mModified;
Record() = default;
Record(const Record&) = default;
Record& operator= (const Record&) = default;
Record(State state,
const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
virtual RecordBase *clone() const; virtual RecordBase *clone() const;
virtual RecordBase *modifiedCopy() const; virtual RecordBase *modifiedCopy() const;
@ -62,14 +69,22 @@ namespace CSMWorld
///< Merge modified into base. ///< Merge modified into base.
}; };
template <typename ESXRecordT>
Record<ESXRecordT>::Record(State state, const ESXRecordT *base, const ESXRecordT *modified)
{
if(base)
mBase = *base;
if(modified)
mModified = *modified;
this->mState = state;
}
template <typename ESXRecordT> template <typename ESXRecordT>
RecordBase *Record<ESXRecordT>::modifiedCopy() const RecordBase *Record<ESXRecordT>::modifiedCopy() const
{ {
Record<ESXRecordT> *record = new Record<ESXRecordT> (*this); return new Record<ESXRecordT> (State_ModifiedOnly, 0, &(this->get()));
record->mModified = record->mBase;
record->mBase = ESXRecordT();
record->mState = RecordBase::State_ModifiedOnly;
return record;
} }
template <typename ESXRecordT> template <typename ESXRecordT>