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

make FNAM sub-record optional for all record types

Browse source
This commit is contained in:
Marc Zinnschlag 2014-04-13 13:23:50 +02:00
parent d2a41167d0
commit 300eb6f444
13 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esm/loadacti.cpp
View file

@ -11,13 +11,13 @@ namespace ESM
void Activator::load(ESMReader &esm) void Activator::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
mScript = esm.getHNOString("SCRI"); mScript = esm.getHNOString("SCRI");
} }
void Activator::save(ESMWriter &esm) const void Activator::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNOCString("SCRI", mScript); esm.writeHNOCString("SCRI", mScript);
} }

4
components/esm/loadarmo.cpp
View file

@ -34,7 +34,7 @@ unsigned int Armor::sRecordId = REC_ARMO;
void Armor::load(ESMReader &esm) void Armor::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
mScript = esm.getHNOString("SCRI"); mScript = esm.getHNOString("SCRI");
esm.getHNT(mData, "AODT", 24); esm.getHNT(mData, "AODT", 24);
mIcon = esm.getHNOString("ITEX"); mIcon = esm.getHNOString("ITEX");
@ -45,7 +45,7 @@ void Armor::load(ESMReader &esm)
void Armor::save(ESMWriter &esm) const void Armor::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNOCString("SCRI", mScript); esm.writeHNOCString("SCRI", mScript);
esm.writeHNT("AODT", mData, 24); esm.writeHNT("AODT", mData, 24);
esm.writeHNOCString("ITEX", mIcon); esm.writeHNOCString("ITEX", mIcon);

4
components/esm/loadbody.cpp
View file

@ -12,13 +12,13 @@ namespace ESM
void BodyPart::load(ESMReader &esm) void BodyPart::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mRace = esm.getHNString("FNAM"); mRace = esm.getHNOString("FNAM");
esm.getHNT(mData, "BYDT", 4); esm.getHNT(mData, "BYDT", 4);
} }
void BodyPart::save(ESMWriter &esm) const void BodyPart::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mRace); esm.writeHNOCString("FNAM", mRace);
esm.writeHNT("BYDT", mData, 4); esm.writeHNT("BYDT", mData, 4);
} }

4
components/esm/loadbsgn.cpp
View file

@ -10,7 +10,7 @@ namespace ESM
void BirthSign::load(ESMReader &esm) void BirthSign::load(ESMReader &esm)
{ {
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
mTexture = esm.getHNOString("TNAM"); mTexture = esm.getHNOString("TNAM");
mDescription = esm.getHNOString("DESC"); mDescription = esm.getHNOString("DESC");
@ -19,7 +19,7 @@ void BirthSign::load(ESMReader &esm)
void BirthSign::save(ESMWriter &esm) const void BirthSign::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNOCString("TNAM", mTexture); esm.writeHNOCString("TNAM", mTexture);
esm.writeHNOCString("DESC", mDescription); esm.writeHNOCString("DESC", mDescription);

4
components/esm/loadclas.cpp
View file

@ -41,7 +41,7 @@ const char *Class::sGmstSpecializationIds[3] = {
void Class::load(ESMReader &esm) void Class::load(ESMReader &esm)
{ {
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "CLDT", 60); esm.getHNT(mData, "CLDT", 60);
if (mData.mIsPlayable > 1) if (mData.mIsPlayable > 1)
@ -51,7 +51,7 @@ void Class::load(ESMReader &esm)
} }
void Class::save(ESMWriter &esm) const void Class::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("CLDT", mData, 60); esm.writeHNT("CLDT", mData, 60);
esm.writeHNOString("DESC", mDescription); esm.writeHNOString("DESC", mDescription);
} }

4
components/esm/loadfact.cpp
View file

@ -28,7 +28,7 @@ namespace ESM
void Faction::load(ESMReader &esm) void Faction::load(ESMReader &esm)
{ {
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
// Read rank names. These are optional. // Read rank names. These are optional.
int i = 0; int i = 0;
@ -52,7 +52,7 @@ void Faction::load(ESMReader &esm)
} }
void Faction::save(ESMWriter &esm) const void Faction::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {

4
components/esm/loadingr.cpp
View file

@ -11,7 +11,7 @@ namespace ESM
void Ingredient::load(ESMReader &esm) void Ingredient::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "IRDT", 56); esm.getHNT(mData, "IRDT", 56);
mScript = esm.getHNOString("SCRI"); mScript = esm.getHNOString("SCRI");
mIcon = esm.getHNOString("ITEX"); mIcon = esm.getHNOString("ITEX");
@ -42,7 +42,7 @@ void Ingredient::load(ESMReader &esm)
void Ingredient::save(ESMWriter &esm) const void Ingredient::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("IRDT", mData, 56); esm.writeHNT("IRDT", mData, 56);
esm.writeHNOCString("SCRI", mScript); esm.writeHNOCString("SCRI", mScript);
esm.writeHNOCString("ITEX", mIcon); esm.writeHNOCString("ITEX", mIcon);

4
components/esm/loadlock.cpp
View file

@ -11,7 +11,7 @@ namespace ESM
void Lockpick::load(ESMReader &esm) void Lockpick::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "LKDT", 16); esm.getHNT(mData, "LKDT", 16);
@ -22,7 +22,7 @@ void Lockpick::load(ESMReader &esm)
void Lockpick::save(ESMWriter &esm) const void Lockpick::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("LKDT", mData, 16); esm.writeHNT("LKDT", mData, 16);
esm.writeHNOString("SCRI", mScript); esm.writeHNOString("SCRI", mScript);

4
components/esm/loadprob.cpp
View file

@ -11,7 +11,7 @@ namespace ESM
void Probe::load(ESMReader &esm) void Probe::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "PBDT", 16); esm.getHNT(mData, "PBDT", 16);
@ -22,7 +22,7 @@ void Probe::load(ESMReader &esm)
void Probe::save(ESMWriter &esm) const void Probe::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("PBDT", mData, 16); esm.writeHNT("PBDT", mData, 16);
esm.writeHNOString("SCRI", mScript); esm.writeHNOString("SCRI", mScript);

4
components/esm/loadrace.cpp
View file

@ -20,14 +20,14 @@ namespace ESM
void Race::load(ESMReader &esm) void Race::load(ESMReader &esm)
{ {
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "RADT", 140); esm.getHNT(mData, "RADT", 140);
mPowers.load(esm); mPowers.load(esm);
mDescription = esm.getHNOString("DESC"); mDescription = esm.getHNOString("DESC");
} }
void Race::save(ESMWriter &esm) const void Race::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("RADT", mData, 140); esm.writeHNT("RADT", mData, 140);
mPowers.save(esm); mPowers.save(esm);
esm.writeHNOString("DESC", mDescription); esm.writeHNOString("DESC", mDescription);

4
components/esm/loadregn.cpp
View file

@ -10,7 +10,7 @@ namespace ESM
void Region::load(ESMReader &esm) void Region::load(ESMReader &esm)
{ {
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
if (esm.getVer() == VER_12) if (esm.getVer() == VER_12)
esm.getHNExact(&mData, sizeof(mData) - 2, "WEAT"); esm.getHNExact(&mData, sizeof(mData) - 2, "WEAT");
@ -32,7 +32,7 @@ void Region::load(ESMReader &esm)
} }
void Region::save(ESMWriter &esm) const void Region::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
if (esm.getVersion() == VER_12) if (esm.getVersion() == VER_12)
esm.writeHNT("WEAT", mData, sizeof(mData) - 2); esm.writeHNT("WEAT", mData, sizeof(mData) - 2);

4
components/esm/loadrepa.cpp
View file

@ -11,7 +11,7 @@ namespace ESM
void Repair::load(ESMReader &esm) void Repair::load(ESMReader &esm)
{ {
mModel = esm.getHNString("MODL"); mModel = esm.getHNString("MODL");
mName = esm.getHNString("FNAM"); mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "RIDT", 16); esm.getHNT(mData, "RIDT", 16);
@ -22,7 +22,7 @@ void Repair::load(ESMReader &esm)
void Repair::save(ESMWriter &esm) const void Repair::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
esm.writeHNCString("FNAM", mName); esm.writeHNOCString("FNAM", mName);
esm.writeHNT("RIDT", mData, 16); esm.writeHNT("RIDT", mData, 16);
esm.writeHNOString("SCRI", mScript); esm.writeHNOString("SCRI", mScript);

4
components/esm/loadsoun.cpp
View file

@ -10,7 +10,7 @@ namespace ESM
void Sound::load(ESMReader &esm) void Sound::load(ESMReader &esm)
{ {
mSound = esm.getHNString("FNAM"); mSound = esm.getHNOString("FNAM");
esm.getHNT(mData, "DATA", 3); esm.getHNT(mData, "DATA", 3);
/* /*
cout << "vol=" << (int)data.volume cout << "vol=" << (int)data.volume
@ -21,7 +21,7 @@ void Sound::load(ESMReader &esm)
} }
void Sound::save(ESMWriter &esm) const void Sound::save(ESMWriter &esm) const
{ {
esm.writeHNCString("FNAM", mSound); esm.writeHNOCString("FNAM", mSound);
esm.writeHNT("DATA", mData, 3); esm.writeHNT("DATA", mData, 3);
} }