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

Fix build errors & warnings

Browse source
This commit is contained in:
Stanislav Bas 2015-07-19 23:27:51 +03:00
parent f5745749a6
commit 1e8182220a
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/doc/savingstages.hpp
View file

@ -102,7 +102,7 @@ namespace CSMDoc
ESM::ESMWriter& writer = mState.getWriter(); ESM::ESMWriter& writer = mState.getWriter();
CSMWorld::RecordBase::State state = mCollection.getRecord (stage).mState; CSMWorld::RecordBase::State state = mCollection.getRecord (stage).mState;
CollectionT::ESXRecord record = mCollection.getRecord (stage).get(); typename CollectionT::ESXRecord record = mCollection.getRecord (stage).get();
if (state == CSMWorld::RecordBase::State_Modified || if (state == CSMWorld::RecordBase::State_Modified ||
state == CSMWorld::RecordBase::State_ModifiedOnly || state == CSMWorld::RecordBase::State_ModifiedOnly ||

8
apps/opencs/model/world/idcollection.hpp
View file

@ -46,7 +46,7 @@ namespace CSMWorld
loadRecord (record, reader); loadRecord (record, reader);
std::string id = IdAccessorT().getId (record); std::string id = IdAccessorT().getId (record);
int index = searchId (id); int index = this->searchId (id);
if (isRecordDeleted(record)) if (isRecordDeleted(record))
{ {
@ -60,13 +60,13 @@ namespace CSMWorld
if (base) if (base)
{ {
removeRows (index, 1); this->removeRows (index, 1);
return -1; return -1;
} }
Record<ESXRecordT> baseRecord = getRecord (index); Record<ESXRecordT> baseRecord = this->getRecord (index);
baseRecord.mState = RecordBase::State_Deleted; baseRecord.mState = RecordBase::State_Deleted;
setRecord (index, baseRecord); this->setRecord (index, baseRecord);
return index; return index;
} }

6
components/esm/cellref.cpp
View file

@ -7,10 +7,12 @@
ESM::CellRef::CellRef() ESM::CellRef::CellRef()
: mScale(1.0f), : mScale(1.0f),
mFactionRank(-2), mFactionRank(-2),
mEnchantmentCharge(-1),
mGoldValue(1),
mChargeInt(-1), mChargeInt(-1),
mEnchantmentCharge(-1.0f),
mGoldValue(1),
mTeleport(false),
mLockLevel(0), mLockLevel(0),
mReferenceBlocked(-1),
mIsDeleted(false) mIsDeleted(false)
{} {}