mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-02 04:45:34 +00:00
d4d1703bcf
cppcheck: [apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types. [apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types. [apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types. [apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference. [apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference. [apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated. [apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container. [apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list. PVS-Studio: apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined. apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false. apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false. apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed. apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty(). apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34. apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true. apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179. apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180. apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181 apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true. apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true. apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present. apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState). apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true. apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9. apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible. apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false. apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16. apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true. apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added. apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691. apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125. apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137. apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression. apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected. components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true. components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282. components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119. components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178. components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0. components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
146 lines
4.8 KiB
C++
146 lines
4.8 KiB
C++
#include "refcollection.hpp"
|
|
|
|
#include <sstream>
|
|
#include <iostream>
|
|
|
|
#include <components/misc/stringops.hpp>
|
|
#include <components/esm/loadcell.hpp>
|
|
|
|
#include "ref.hpp"
|
|
#include "cell.hpp"
|
|
#include "universalid.hpp"
|
|
#include "record.hpp"
|
|
|
|
void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
|
|
std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages)
|
|
{
|
|
Record<Cell> cell = mCells.getRecord (cellIndex);
|
|
|
|
Cell& cell2 = base ? cell.mBase : cell.mModified;
|
|
|
|
CellRef ref;
|
|
ref.mNew = false;
|
|
ESM::MovedCellRef mref;
|
|
bool isDeleted = false;
|
|
|
|
// hack to initialise mindex
|
|
while (!(mref.mRefNum.mIndex == 0) && ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
|
|
{
|
|
// Keep mOriginalCell empty when in modified (as an indicator that the
|
|
// original cell will always be equal the current cell).
|
|
ref.mOriginalCell = base ? cell2.mId : "";
|
|
|
|
if (cell.get().isExterior())
|
|
{
|
|
// ignoring moved references sub-record; instead calculate cell from coordinates
|
|
std::pair<int, int> index = ref.getCellIndex();
|
|
|
|
std::ostringstream stream;
|
|
stream << "#" << index.first << " " << index.second;
|
|
|
|
ref.mCell = stream.str();
|
|
|
|
if (!base && // don't try to update base records
|
|
mref.mRefNum.mIndex != 0) // MVRF tag found
|
|
{
|
|
// there is a requirement for a placeholder where the original object was
|
|
//
|
|
// see the forum discussions here for more details:
|
|
// https://forum.openmw.org/viewtopic.php?f=6&t=577&start=30
|
|
ref.mOriginalCell = cell2.mId;
|
|
|
|
// It is not always possibe to ignore moved references sub-record and
|
|
// calculate from coordinates. Some mods may place the ref in positions
|
|
// outside normal bounds, resulting in non sensical cell id's. This often
|
|
// happens if the moved ref was deleted.
|
|
//
|
|
// Use the target cell from the MVRF tag but if different output an error
|
|
// message
|
|
if (index.first != mref.mTarget[0] || index.second != mref.mTarget[1])
|
|
{
|
|
std::cerr << "The Position of moved ref "
|
|
<< ref.mRefID << " does not match the target cell" << std::endl;
|
|
std::cerr << "Position: #" << index.first << " " << index.second
|
|
<<", Target #"<< mref.mTarget[0] << " " << mref.mTarget[1] << std::endl;
|
|
|
|
stream.clear();
|
|
stream << "#" << mref.mTarget[0] << " " << mref.mTarget[1];
|
|
ref.mCell = stream.str(); // overwrite
|
|
}
|
|
}
|
|
}
|
|
else
|
|
ref.mCell = cell2.mId;
|
|
|
|
// ignore content file number
|
|
std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
|
|
for (; iter != cache.end(); ++iter)
|
|
{
|
|
if (ref.mRefNum.mIndex == iter->first.mIndex)
|
|
break;
|
|
}
|
|
|
|
if (isDeleted)
|
|
{
|
|
if (iter==cache.end())
|
|
{
|
|
CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell,
|
|
mCells.getId (cellIndex));
|
|
|
|
messages.add (id, "Attempt to delete a non-existing reference");
|
|
continue;
|
|
}
|
|
|
|
int index = getIndex (iter->second);
|
|
|
|
Record<CellRef> record = getRecord (index);
|
|
|
|
if (base)
|
|
{
|
|
removeRows (index, 1);
|
|
cache.erase (iter);
|
|
}
|
|
else
|
|
{
|
|
record.mState = RecordBase::State_Deleted;
|
|
setRecord (index, record);
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
if (iter==cache.end())
|
|
{
|
|
// new reference
|
|
ref.mId = getNewId();
|
|
|
|
Record<CellRef> record;
|
|
record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
|
|
(base ? record.mBase : record.mModified) = ref;
|
|
|
|
appendRecord (record);
|
|
|
|
cache.insert (std::make_pair (ref.mRefNum, ref.mId));
|
|
}
|
|
else
|
|
{
|
|
// old reference -> merge
|
|
ref.mId = iter->second;
|
|
|
|
int index = getIndex (ref.mId);
|
|
|
|
Record<CellRef> record = getRecord (index);
|
|
record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
|
|
(base ? record.mBase : record.mModified) = ref;
|
|
|
|
setRecord (index, record);
|
|
}
|
|
}
|
|
}
|
|
|
|
std::string CSMWorld::RefCollection::getNewId()
|
|
{
|
|
std::ostringstream stream;
|
|
stream << "ref#" << mNextId++;
|
|
return stream.str();
|
|
}
|