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

Move the workaround to loadscpt.cpp as per feedback comments.

Browse source
This commit is contained in:
cc9cii 2014-08-29 07:41:49 +10:00
parent 52daaf6ce3
commit df87859d7c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwworld/esmstore.cpp
View file

@ -99,17 +99,6 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
} }
it->second->load(esm, id); it->second->load(esm, id);
// NOTE: A minor hack/workaround...
//
// MAO_Containers.esp from Morrowind Acoustic Overhaul has SCVR records
// at the end (see Bug #1849). Since OpenMW does not use SCVR subrecords
// for variable names just skip these as a quick fix. An alternative
// solution would be to decode and validate SCVR subrecords even if they
// appear at the end (in loadscpt.cpp).
if (esm.isNextSub("SCVR")) {
esm.skipRecord();
}
// DELE can also occur after the usual subrecords // DELE can also occur after the usual subrecords
if (esm.isNextSub("DELE")) { if (esm.isNextSub("DELE")) {
esm.skipRecord(); esm.skipRecord();

11
components/esm/loadscpt.cpp
View file

@ -69,6 +69,17 @@ void Script::load(ESMReader &esm)
// Script text // Script text
mScriptText = esm.getHNOString("SCTX"); mScriptText = esm.getHNOString("SCTX");
// NOTE: A minor hack/workaround...
//
// MAO_Containers.esp from Morrowind Acoustic Overhaul has SCVR records
// at the end (see Bug #1849). Since OpenMW does not use SCVR subrecords
// for variable names just skip these as a quick fix. An alternative
// solution would be to decode and validate SCVR subrecords even if they
// appear here.
if (esm.isNextSub("SCVR")) {
esm.skipHSub();
}
} }
void Script::save(ESMWriter &esm) const void Script::save(ESMWriter &esm) const
{ {