fix to content file reading error reporting in case of missing dependency

actorid
Marc Zinnschlag 11 years ago
parent bf4ffe94dc
commit 1cf1d49bc4

@ -52,7 +52,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
if (index == (int)~0) { if (index == (int)~0) {
// Tried to load a parent file that has not been loaded yet. This is bad, // Tried to load a parent file that has not been loaded yet. This is bad,
// the launcher should have taken care of this. // the launcher should have taken care of this.
std::string fstring = "File " + fname + " asks for parent file " + masters[j].name std::string fstring = "File " + esm.getName() + " asks for parent file " + masters[j].name
+ ", but it has not been loaded yet. Please check your load order."; + ", but it has not been loaded yet. Please check your load order.";
esm.fail(fstring); esm.fail(fstring);
} }

@ -8,6 +8,11 @@ namespace ESM
using namespace Misc; using namespace Misc;
std::string ESMReader::getName() const
{
return mCtx.filename;
}
ESM_Context ESMReader::getContext() ESM_Context ESMReader::getContext()
{ {
// Update the file position before returning // Update the file position before returning

@ -38,6 +38,7 @@ public:
int getFormat() const; int getFormat() const;
const NAME &retSubName() const { return mCtx.subName; } const NAME &retSubName() const { return mCtx.subName; }
uint32_t getSubSize() const { return mCtx.leftSub; } uint32_t getSubSize() const { return mCtx.leftSub; }
std::string getName() const;
/************************************************************************* /*************************************************************************
* *

Loading…
Cancel
Save