From ccde462308e6ad956c9f217123873923459250b2 Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 29 Jul 2014 19:01:14 +0200 Subject: [PATCH] Fix typo (RefId -> RefNum) --- apps/esmtool/record.cpp | 2 +- components/esm/loadcell.cpp | 10 +++++----- components/esm/loadcell.hpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp index f8bc2af61..caf67e619 100644 --- a/apps/esmtool/record.cpp +++ b/apps/esmtool/record.cpp @@ -513,7 +513,7 @@ void Record::print() else std::cout << " Map Color: " << boost::format("0x%08X") % mData.mMapColor << 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; } diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp index 0a25fce84..91da936a4 100644 --- a/components/esm/loadcell.cpp +++ b/components/esm/loadcell.cpp @@ -58,7 +58,7 @@ void Cell::load(ESMReader &esm, bool saveContext) void Cell::loadCell(ESMReader &esm, bool saveContext) { - mRefIdCounter = 0; + mRefNumCounter = 0; if (mData.mFlags & Interior) { @@ -92,7 +92,7 @@ void Cell::loadCell(ESMReader &esm, bool saveContext) esm.getHNOT(mMapColor, "NAM5"); } if (esm.isNextSub("NAM0")) { - esm.getHT(mRefIdCounter); + esm.getHT(mRefNumCounter); } if (saveContext) { @@ -150,8 +150,8 @@ void Cell::save(ESMWriter &esm) const esm.writeHNT("NAM5", mMapColor); } - if (mRefIdCounter != 0) - esm.writeHNT("NAM0", mRefIdCounter); + if (mRefNumCounter != 0) + esm.writeHNT("NAM0", mRefNumCounter); } void Cell::restore(ESMReader &esm, int iCtx) const @@ -220,7 +220,7 @@ bool Cell::getNextMVRF(ESMReader &esm, MovedCellRef &mref) mWater = 0; mWaterInt = false; mMapColor = 0; - mRefIdCounter = 0; + mRefNumCounter = 0; mData.mFlags = 0; mData.mX = 0; diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp index 5f889a55b..f40b3db61 100644 --- a/components/esm/loadcell.hpp +++ b/components/esm/loadcell.hpp @@ -94,10 +94,10 @@ struct Cell float mWater; // Water level bool mWaterInt; int mMapColor; - // Counter for RefIds. This is only used during content file editing and has no impact on gameplay. - // It prevents overwriting previous refIDs, even if they were deleted. + // Counter for RefNums. This is only used during content file editing and has no impact on gameplay. + // It prevents overwriting previous refNums, even if they were deleted. // 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 // introduced this ref, and it has been moved here by a plugin)