mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 20:39:43 +00:00
Code Issues Releases Wiki Activity

Minor formatting change.

Browse source
This commit is contained in:
cc9cii 2015-12-11 22:39:03 +11:00
parent de5ce7059e
commit f6d6138f46
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/opencs/model/world/refcollection.cpp
View file

@ -40,7 +40,7 @@ namespace CSMWorld
void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base, void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages) std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages)
{ {
Record<Cell> cell = mCells.getRecord (cellIndex); Record<Cell> cell = mCells.getRecord(cellIndex);
Cell& cell2 = base ? cell.mBase : cell.mModified; Cell& cell2 = base ? cell.mBase : cell.mModified;
@ -80,8 +80,8 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
// message // message
if (index.first != mref.mTarget[0] || index.second != mref.mTarget[1]) if (index.first != mref.mTarget[0] || index.second != mref.mTarget[1])
{ {
CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell, mCells.getId (cellIndex)); CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
messages.add (id, "The Position of moved ref " + ref.mRefID + " (#" messages.add(id, "The Position of moved ref " + ref.mRefID + " (#"
+ std::to_string(index.first) + " " + std::to_string(index.second) + std::to_string(index.first) + " " + std::to_string(index.second)
+ ") does not match the target cell (#" + ") does not match the target cell (#"
+ std::to_string(mref.mTarget[0]) + " " + std::to_string(mref.mTarget[1]) + ")", + std::to_string(mref.mTarget[0]) + " " + std::to_string(mref.mTarget[1]) + ")",
@ -103,12 +103,10 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
if (isDeleted) if (isDeleted)
{ {
if (iter==cache.end()) if (iter == cache.end())
{ {
CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell, CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
mCells.getId (cellIndex)); messages.add(id, "Attempt to delete a non-existing reference - RefNum index "
messages.add (id, "Attempt to delete a non-existing reference - RefNum index "
+ std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index " + std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index "
+ std::to_string(ref.mRefNum.mContentFile), + std::to_string(ref.mRefNum.mContentFile),
/*hint*/"", /*hint*/"",
@ -116,12 +114,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
continue; continue;
} }
int index = getIndex (iter->second); int index = getIndex(iter->second);
if (base) if (base)
{ {
removeRows (index, 1); removeRows(index, 1);
cache.erase (iter); cache.erase(iter);
} }
else else
{ {
@ -133,7 +131,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
continue; continue;
} }
if (iter==cache.end()) if (iter == cache.end())
{ {
// new reference // new reference
ref.mIdNum = mNextId; // FIXME: fragile ref.mIdNum = mNextId; // FIXME: fragile