mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Warn about cellrefs with an empty refId (Bug #3238)

Browse source
This commit is contained in:
scrawl 2016-03-07 22:39:43 +01:00
parent d0aba0d9ee
commit 3e6cf17665
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/cellstore.cpp
View file

@ -194,7 +194,7 @@ namespace MWWorld
else else
{ {
std::cerr std::cerr
<< "Error: could not resolve cell reference " << ref.mRefID << "Error: could not resolve cell reference '" << ref.mRefID << "'"
<< " (dropping reference)" << std::endl; << " (dropping reference)" << std::endl;
} }
} }
@ -612,7 +612,7 @@ namespace MWWorld
case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break; case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break; case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
case 0: std::cerr << "Cell reference " + ref.mRefID + " not found!\n"; break; case 0: std::cerr << "Cell reference '" + ref.mRefID + "' not found!\n"; break;
default: default:
std::cerr std::cerr

10
components/esm/cellref.cpp
View file

@ -1,5 +1,7 @@
#include "cellref.hpp" #include "cellref.hpp"
#include <iostream>
#include "esmreader.hpp" #include "esmreader.hpp"
#include "esmwriter.hpp" #include "esmwriter.hpp"
@ -43,7 +45,13 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
mRefNum.load (esm, wideRefNum); mRefNum.load (esm, wideRefNum);
mRefID = esm.getHNString ("NAME"); mRefID = esm.getHNOString ("NAME");
if (mRefID.empty())
{
std::ios::fmtflags f(std::cerr.flags());
std::cerr << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset() << std::endl;
std::cerr.flags(f);
}
} }
void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted) void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)