mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-08 09:37:53 +00:00
Code Issues Projects Releases Wiki Activity

removed leftover ignoreRefNum argument

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-04-29 11:36:56 +02:00
parent f1c0847897
commit 607a16eb01
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/esm/cellref.cpp
View File

@ -25,13 +25,13 @@ void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
}
void ESM::CellRef::load (ESMReader& esm, bool wideRefNum, bool ignoreRefNum)
void ESM::CellRef::load (ESMReader& esm, bool wideRefNum)
{
loadId(esm, wideRefNum, ignoreRefNum);
loadId(esm, wideRefNum);
loadData(esm);
}
void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum, bool ignoreRefNum)
void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
{
// According to Hrnchamd, this does not belong to the actual ref. Instead, it is a marker indicating that
// the following refs are part of a "temp refs" section. A temp ref is not being tracked by the moved references system.
@ -40,8 +40,7 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum, bool ignoreRefNum)
if (esm.isNextSub ("NAM0"))
esm.skipHSub();
if (!ignoreRefNum)
mRefNum.load (esm, wideRefNum);
mRefNum.load (esm, wideRefNum);
mRefID = esm.getHNString ("NAME");
}

4
components/esm/cellref.hpp
View File

@ -100,9 +100,9 @@ namespace ESM
Position mPos;
/// Calls loadId and loadData
void load (ESMReader& esm, bool wideRefNum = false, bool ignoreRefNum = false);
void load (ESMReader& esm, bool wideRefNum = false);
void loadId (ESMReader& esm, bool wideRefNum = false, bool ignoreRefNum = false);
void loadId (ESMReader& esm, bool wideRefNum = false);
/// Implicitly called by load
void loadData (ESMReader& esm);