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

Merge pull request #1226 from MiroslavR/scdt_size

Browse source 
Downgrade SCDT size mismatch error to a warning
This commit is contained in:
scrawl 2017-03-18 19:04:31 +01:00 committed by GitHub
commit 4a1406c638
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esm/loadscpt.cpp
View file

@ -83,10 +83,24 @@ namespace ESM
loadSCVR(esm);
break;
case ESM::FourCC<'S','C','D','T'>::value:
{
// compiled script
mScriptData.resize(mData.mScriptDataSize);
esm.getHExact(&mScriptData[0], mScriptData.size());
esm.getSubHeader();
uint32_t subSize = esm.getSubSize();
if (subSize != static_cast<uint32_t>(mData.mScriptDataSize))
{
std::stringstream ss;
ss << "ESM Warning: Script data size defined in SCHD subrecord does not match size of SCDT subrecord";
ss << "\n File: " << esm.getName();
ss << "\n Offset: 0x" << std::hex << esm.getFileOffset();
std::cerr << ss.str() << std::endl;
}
mScriptData.resize(subSize);
esm.getExact(&mScriptData[0], mScriptData.size());
break;
}
case ESM::FourCC<'S','C','T','X'>::value:
mScriptText = esm.getHString();
break;