mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 15:29:55 +00:00
Bring ESM4 global variable reading up-to-date with FO76
This commit is contained in:
parent
f9825328d2
commit
0b63fafc6d
2 changed files with 5 additions and 7 deletions
|
@ -44,19 +44,16 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader)
|
||||||
case ESM4::SUB_EDID:
|
case ESM4::SUB_EDID:
|
||||||
reader.getZString(mEditorId);
|
reader.getZString(mEditorId);
|
||||||
break;
|
break;
|
||||||
|
case ESM::fourCC("XALG"): // FO76
|
||||||
|
reader.get(mExtraFlags2);
|
||||||
|
break;
|
||||||
case ESM4::SUB_FNAM:
|
case ESM4::SUB_FNAM:
|
||||||
reader.get(mType);
|
reader.get(mType);
|
||||||
break;
|
break;
|
||||||
case ESM4::SUB_FLTV:
|
case ESM4::SUB_FLTV:
|
||||||
reader.get(mValue);
|
reader.get(mValue);
|
||||||
break;
|
break;
|
||||||
case ESM4::SUB_FULL:
|
case ESM::fourCC("NTWK"): // FO76
|
||||||
case ESM4::SUB_MODL:
|
|
||||||
case ESM4::SUB_MODB:
|
|
||||||
case ESM4::SUB_ICON:
|
|
||||||
case ESM4::SUB_DATA:
|
|
||||||
case ESM4::SUB_OBND: // TES5
|
|
||||||
case ESM4::SUB_VMAD: // TES5
|
|
||||||
reader.skipSubRecordData();
|
reader.skipSubRecordData();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -42,6 +42,7 @@ namespace ESM4
|
||||||
{
|
{
|
||||||
ESM::FormId mId; // from the header
|
ESM::FormId mId; // from the header
|
||||||
std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
|
std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
|
||||||
|
std::uint64_t mExtraFlags2;
|
||||||
|
|
||||||
std::string mEditorId;
|
std::string mEditorId;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue