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

Fix typo (RefId -> RefNum)

Browse source
This commit is contained in:
scrawl 2014-07-29 19:01:14 +02:00
parent 9e48d56244
commit ccde462308
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/record.cpp
View file

@ -513,7 +513,7 @@ void Record<ESM::Cell>::print()
else else
std::cout << " Map Color: " << boost::format("0x%08X") % mData.mMapColor << std::endl; std::cout << " Map Color: " << boost::format("0x%08X") % mData.mMapColor << std::endl;
std::cout << " Water Level Int: " << mData.mWaterInt << std::endl; std::cout << " Water Level Int: " << mData.mWaterInt << std::endl;
std::cout << " RefId counter: " << mData.mRefIdCounter << std::endl; std::cout << " RefId counter: " << mData.mRefNumCounter << std::endl;
} }

10
components/esm/loadcell.cpp
View file

@ -58,7 +58,7 @@ void Cell::load(ESMReader &esm, bool saveContext)
void Cell::loadCell(ESMReader &esm, bool saveContext) void Cell::loadCell(ESMReader &esm, bool saveContext)
{ {
mRefIdCounter = 0; mRefNumCounter = 0;
if (mData.mFlags & Interior) if (mData.mFlags & Interior)
{ {
@ -92,7 +92,7 @@ void Cell::loadCell(ESMReader &esm, bool saveContext)
esm.getHNOT(mMapColor, "NAM5"); esm.getHNOT(mMapColor, "NAM5");
} }
if (esm.isNextSub("NAM0")) { if (esm.isNextSub("NAM0")) {
esm.getHT(mRefIdCounter); esm.getHT(mRefNumCounter);
} }
if (saveContext) { if (saveContext) {
@ -150,8 +150,8 @@ void Cell::save(ESMWriter &esm) const
esm.writeHNT("NAM5", mMapColor); esm.writeHNT("NAM5", mMapColor);
} }
if (mRefIdCounter != 0) if (mRefNumCounter != 0)
esm.writeHNT("NAM0", mRefIdCounter); esm.writeHNT("NAM0", mRefNumCounter);
} }
void Cell::restore(ESMReader &esm, int iCtx) const void Cell::restore(ESMReader &esm, int iCtx) const
@ -220,7 +220,7 @@ bool Cell::getNextMVRF(ESMReader &esm, MovedCellRef &mref)
mWater = 0; mWater = 0;
mWaterInt = false; mWaterInt = false;
mMapColor = 0; mMapColor = 0;
mRefIdCounter = 0; mRefNumCounter = 0;
mData.mFlags = 0; mData.mFlags = 0;
mData.mX = 0; mData.mX = 0;

6
components/esm/loadcell.hpp
View file

@ -94,10 +94,10 @@ struct Cell
float mWater; // Water level float mWater; // Water level
bool mWaterInt; bool mWaterInt;
int mMapColor; int mMapColor;
// Counter for RefIds. This is only used during content file editing and has no impact on gameplay. // Counter for RefNums. This is only used during content file editing and has no impact on gameplay.
// It prevents overwriting previous refIDs, even if they were deleted. // It prevents overwriting previous refNums, even if they were deleted.
// as that would collide with refs when a content file is upgraded. // as that would collide with refs when a content file is upgraded.
int mRefIdCounter; int mRefNumCounter;
// References "leased" from another cell (i.e. a different cell // References "leased" from another cell (i.e. a different cell
// introduced this ref, and it has been moved here by a plugin) // introduced this ref, and it has been moved here by a plugin)