1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-06 18:46:39 +00:00

Set Deleted flag to false when initializing ESM records

(cherry picked from commit 7ecb54a776)
This commit is contained in:
Stanislav Bas 2015-07-09 21:45:24 +03:00 committed by cc9cii
parent 19acd1fada
commit 80074f90bf
67 changed files with 815 additions and 619 deletions

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Activator::sRecordId = REC_ACTI; unsigned int Activator::sRecordId = REC_ACTI;
Activator::Activator()
: mIsDeleted(false)
{}
void Activator::load(ESMReader &esm) void Activator::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -19,6 +19,8 @@ struct Activator
bool mIsDeleted; bool mIsDeleted;
Activator();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Potion::sRecordId = REC_ALCH; unsigned int Potion::sRecordId = REC_ALCH;
Potion::Potion()
: mIsDeleted(false)
{}
void Potion::load(ESMReader &esm) void Potion::load(ESMReader &esm)
{ {
mEffects.mList.clear(); mEffects.mList.clear();

View file

@ -35,6 +35,8 @@ struct Potion
bool mIsDeleted; bool mIsDeleted;
Potion();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Apparatus::sRecordId = REC_APPA; unsigned int Apparatus::sRecordId = REC_APPA;
Apparatus::Apparatus()
: mIsDeleted(false)
{}
void Apparatus::load(ESMReader &esm) void Apparatus::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -40,6 +40,8 @@ struct Apparatus
bool mIsDeleted; bool mIsDeleted;
Apparatus();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -39,6 +39,10 @@ namespace ESM
unsigned int Armor::sRecordId = REC_ARMO; unsigned int Armor::sRecordId = REC_ARMO;
Armor::Armor()
: mIsDeleted(false)
{}
void Armor::load(ESMReader &esm) void Armor::load(ESMReader &esm)
{ {
mParts.mParts.clear(); mParts.mParts.clear();

View file

@ -98,6 +98,8 @@ struct Armor
bool mIsDeleted; bool mIsDeleted;
Armor();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,9 @@ namespace ESM
{ {
unsigned int BodyPart::sRecordId = REC_BODY; unsigned int BodyPart::sRecordId = REC_BODY;
BodyPart::BodyPart()
: mIsDeleted(false)
{}
void BodyPart::load(ESMReader &esm) void BodyPart::load(ESMReader &esm)
{ {
@ -43,6 +46,7 @@ void BodyPart::load(ESMReader &esm)
if (!hasData) if (!hasData)
esm.fail("Missing BYDT subrecord"); esm.fail("Missing BYDT subrecord");
} }
void BodyPart::save(ESMWriter &esm) const void BodyPart::save(ESMWriter &esm) const
{ {
esm.writeHNCString("NAME", mId); esm.writeHNCString("NAME", mId);

View file

@ -62,6 +62,8 @@ struct BodyPart
bool mIsDeleted; bool mIsDeleted;
BodyPart();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Book::sRecordId = REC_BOOK; unsigned int Book::sRecordId = REC_BOOK;
Book::Book()
: mIsDeleted(false)
{}
void Book::load(ESMReader &esm) void Book::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -30,6 +30,8 @@ struct Book
bool mIsDeleted; bool mIsDeleted;
Book();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int BirthSign::sRecordId = REC_BSGN; unsigned int BirthSign::sRecordId = REC_BSGN;
BirthSign::BirthSign()
: mIsDeleted(false)
{}
void BirthSign::load(ESMReader &esm) void BirthSign::load(ESMReader &esm)
{ {
mPowers.mList.clear(); mPowers.mList.clear();

View file

@ -24,6 +24,8 @@ struct BirthSign
bool mIsDeleted; bool mIsDeleted;
BirthSign();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -85,7 +85,8 @@ struct Cell
mWater(0), mWater(0),
mWaterInt(false), mWaterInt(false),
mMapColor(0), mMapColor(0),
mRefNumCounter(0) mRefNumCounter(0),
mIsDeleted(false)
{} {}
// Interior cells are indexed by this (it's the 'id'), for exterior // Interior cells are indexed by this (it's the 'id'), for exterior

View file

@ -23,6 +23,9 @@ namespace ESM
"sSpecializationStealth" "sSpecializationStealth"
}; };
Class::Class()
: mIsDeleted(false)
{}
int& Class::CLDTstruct::getSkill (int index, bool major) int& Class::CLDTstruct::getSkill (int index, bool major)
{ {

View file

@ -75,6 +75,8 @@ struct Class
bool mIsDeleted; bool mIsDeleted;
Class();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Clothing::sRecordId = REC_CLOT; unsigned int Clothing::sRecordId = REC_CLOT;
Clothing::Clothing()
: mIsDeleted(false)
{}
void Clothing::load(ESMReader &esm) void Clothing::load(ESMReader &esm)
{ {
mParts.mParts.clear(); mParts.mParts.clear();

View file

@ -50,6 +50,8 @@ struct Clothing
bool mIsDeleted; bool mIsDeleted;
Clothing();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -25,6 +25,10 @@ namespace ESM
unsigned int Container::sRecordId = REC_CONT; unsigned int Container::sRecordId = REC_CONT;
Container::Container()
: mIsDeleted(false)
{}
void Container::load(ESMReader &esm) void Container::load(ESMReader &esm)
{ {
mInventory.mList.clear(); mInventory.mList.clear();

View file

@ -54,6 +54,8 @@ struct Container
bool mIsDeleted; bool mIsDeleted;
Container();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM {
unsigned int Creature::sRecordId = REC_CREA; unsigned int Creature::sRecordId = REC_CREA;
Creature::Creature()
: mIsDeleted(false)
{}
void Creature::load(ESMReader &esm) void Creature::load(ESMReader &esm)
{ {
mPersistent = (esm.getRecordFlags() & 0x0400) != 0; mPersistent = (esm.getRecordFlags() & 0x0400) != 0;

View file

@ -98,6 +98,8 @@ struct Creature
bool mIsDeleted; bool mIsDeleted;
Creature();
const std::vector<Transport::Dest>& getTransport() const; const std::vector<Transport::Dest>& getTransport() const;
void load(ESMReader &esm); void load(ESMReader &esm);

View file

@ -13,6 +13,10 @@ namespace ESM
{ {
unsigned int Dialogue::sRecordId = REC_DIAL; unsigned int Dialogue::sRecordId = REC_DIAL;
Dialogue::Dialogue()
: mIsDeleted(false)
{}
void Dialogue::load(ESMReader &esm) void Dialogue::load(ESMReader &esm)
{ {
mIsDeleted = false; mIsDeleted = false;
@ -133,5 +137,4 @@ void Dialogue::clearDeletedInfos()
++it; ++it;
} }
} }
} }

View file

@ -47,6 +47,8 @@ struct Dialogue
bool mIsDeleted; bool mIsDeleted;
Dialogue();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Door::sRecordId = REC_DOOR; unsigned int Door::sRecordId = REC_DOOR;
Door::Door()
: mIsDeleted(false)
{}
void Door::load(ESMReader &esm) void Door::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -19,6 +19,8 @@ struct Door
bool mIsDeleted; bool mIsDeleted;
Door();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Enchantment::sRecordId = REC_ENCH; unsigned int Enchantment::sRecordId = REC_ENCH;
Enchantment::Enchantment()
: mIsDeleted(false)
{}
void Enchantment::load(ESMReader &esm) void Enchantment::load(ESMReader &esm)
{ {
mEffects.mList.clear(); mEffects.mList.clear();

View file

@ -44,6 +44,8 @@ struct Enchantment
bool mIsDeleted; bool mIsDeleted;
Enchantment();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -11,6 +11,10 @@ namespace ESM
{ {
unsigned int Faction::sRecordId = REC_FACT; unsigned int Faction::sRecordId = REC_FACT;
Faction::Faction()
: mIsDeleted(false)
{}
int& Faction::FADTstruct::getSkill (int index, bool ignored) int& Faction::FADTstruct::getSkill (int index, bool ignored)
{ {
if (index<0 || index>=7) if (index<0 || index>=7)
@ -76,6 +80,7 @@ void Faction::load(ESMReader &esm)
if (!hasData) if (!hasData)
esm.fail("Missing FADT subrecord"); esm.fail("Missing FADT subrecord");
} }
void Faction::save(ESMWriter &esm) const void Faction::save(ESMWriter &esm) const
{ {
esm.writeHNCString("NAME", mId); esm.writeHNCString("NAME", mId);

View file

@ -64,6 +64,8 @@ struct Faction
bool mIsDeleted; bool mIsDeleted;
Faction();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Global::sRecordId = REC_GLOB; unsigned int Global::sRecordId = REC_GLOB;
Global::Global()
: mIsDeleted(false)
{}
void Global::load (ESMReader &esm) void Global::load (ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -26,6 +26,8 @@ struct Global
bool mIsDeleted; bool mIsDeleted;
Global();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int DialInfo::sRecordId = REC_INFO; unsigned int DialInfo::sRecordId = REC_INFO;
DialInfo::DialInfo()
: mIsDeleted(false)
{}
void DialInfo::load(ESMReader &esm) void DialInfo::load(ESMReader &esm)
{ {
mQuestStatus = QS_None; mQuestStatus = QS_None;

View file

@ -108,6 +108,8 @@ struct DialInfo
bool mIsDeleted; bool mIsDeleted;
DialInfo();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Ingredient::sRecordId = REC_INGR; unsigned int Ingredient::sRecordId = REC_INGR;
Ingredient::Ingredient()
: mIsDeleted(false)
{}
void Ingredient::load(ESMReader &esm) void Ingredient::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -33,6 +33,8 @@ struct Ingredient
bool mIsDeleted; bool mIsDeleted;
Ingredient();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -7,6 +7,9 @@
namespace ESM namespace ESM
{ {
LevelledListBase::LevelledListBase()
: mIsDeleted(false)
{}
void LevelledListBase::load(ESMReader &esm) void LevelledListBase::load(ESMReader &esm)
{ {

View file

@ -38,6 +38,8 @@ struct LevelledListBase
bool mIsDeleted; bool mIsDeleted;
LevelledListBase();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Light::sRecordId = REC_LIGH; unsigned int Light::sRecordId = REC_LIGH;
Light::Light()
: mIsDeleted(false)
{}
void Light::load(ESMReader &esm) void Light::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -49,6 +49,8 @@ struct Light
bool mIsDeleted; bool mIsDeleted;
Light();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Lockpick::sRecordId = REC_LOCK; unsigned int Lockpick::sRecordId = REC_LOCK;
Lockpick::Lockpick()
: mIsDeleted(false)
{}
void Lockpick::load(ESMReader &esm) void Lockpick::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -29,6 +29,8 @@ struct Lockpick
bool mIsDeleted; bool mIsDeleted;
Lockpick();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int LandTexture::sRecordId = REC_LTEX; unsigned int LandTexture::sRecordId = REC_LTEX;
LandTexture::LandTexture()
: mIsDeleted(false)
{}
void LandTexture::load(ESMReader &esm) void LandTexture::load(ESMReader &esm)
{ {
mIsDeleted = readDeleSubRecord(esm); mIsDeleted = readDeleSubRecord(esm);
@ -33,5 +37,4 @@ void LandTexture::blank()
mIndex = -1; mIndex = -1;
mIsDeleted = false; mIsDeleted = false;
} }
} }

View file

@ -36,11 +36,13 @@ struct LandTexture
bool mIsDeleted; bool mIsDeleted;
void blank(); LandTexture();
///< Set record to default state (does not touch the ID).
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;
void blank();
///< Set record to default state (does not touch the ID).
}; };
} }
#endif #endif

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Miscellaneous::sRecordId = REC_MISC; unsigned int Miscellaneous::sRecordId = REC_MISC;
Miscellaneous::Miscellaneous()
: mIsDeleted(false)
{}
void Miscellaneous::load(ESMReader &esm) void Miscellaneous::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -34,6 +34,8 @@ struct Miscellaneous
bool mIsDeleted; bool mIsDeleted;
Miscellaneous();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int NPC::sRecordId = REC_NPC_; unsigned int NPC::sRecordId = REC_NPC_;
NPC::NPC()
: mIsDeleted(false)
{}
void NPC::load(ESMReader &esm) void NPC::load(ESMReader &esm)
{ {
mPersistent = (esm.getRecordFlags() & 0x0400) != 0; mPersistent = (esm.getRecordFlags() & 0x0400) != 0;

View file

@ -132,6 +132,8 @@ struct NPC
bool mIsDeleted; bool mIsDeleted;
NPC();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Probe::sRecordId = REC_PROB; unsigned int Probe::sRecordId = REC_PROB;
Probe::Probe()
: mIsDeleted(false)
{}
void Probe::load(ESMReader &esm) void Probe::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -29,6 +29,8 @@ struct Probe
bool mIsDeleted; bool mIsDeleted;
Probe();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Region::sRecordId = REC_REGN; unsigned int Region::sRecordId = REC_REGN;
Region::Region()
: mIsDeleted(false)
{}
void Region::load(ESMReader &esm) void Region::load(ESMReader &esm)
{ {
mIsDeleted = readDeleSubRecord(esm); mIsDeleted = readDeleSubRecord(esm);
@ -50,6 +54,7 @@ void Region::load(ESMReader &esm)
mSoundList.push_back(sr); mSoundList.push_back(sr);
} }
} }
void Region::save(ESMWriter &esm) const void Region::save(ESMWriter &esm) const
{ {
if (mIsDeleted) if (mIsDeleted)

View file

@ -53,6 +53,8 @@ struct Region
bool mIsDeleted; bool mIsDeleted;
Region();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Repair::sRecordId = REC_REPA; unsigned int Repair::sRecordId = REC_REPA;
Repair::Repair()
: mIsDeleted(false)
{}
void Repair::load(ESMReader &esm) void Repair::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -29,6 +29,8 @@ struct Repair
bool mIsDeleted; bool mIsDeleted;
Repair();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -7,9 +7,12 @@
namespace ESM namespace ESM
{ {
unsigned int Script::sRecordId = REC_SCPT; unsigned int Script::sRecordId = REC_SCPT;
Script::Script()
: mIsDeleted(false)
{}
void Script::loadSCVR(ESMReader &esm) void Script::loadSCVR(ESMReader &esm)
{ {
int s = mData.mStringTableSize; int s = mData.mStringTableSize;

View file

@ -52,6 +52,8 @@ public:
bool mIsDeleted; bool mIsDeleted;
Script();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int SoundGenerator::sRecordId = REC_SNDG; unsigned int SoundGenerator::sRecordId = REC_SNDG;
SoundGenerator::SoundGenerator()
: mIsDeleted(false)
{}
void SoundGenerator::load(ESMReader &esm) void SoundGenerator::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -38,6 +38,8 @@ struct SoundGenerator
bool mIsDeleted; bool mIsDeleted;
SoundGenerator();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Sound::sRecordId = REC_SOUN; unsigned int Sound::sRecordId = REC_SOUN;
Sound::Sound()
: mIsDeleted(false)
{}
void Sound::load(ESMReader &esm) void Sound::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -25,6 +25,8 @@ struct Sound
bool mIsDeleted; bool mIsDeleted;
Sound();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Spell::sRecordId = REC_SPEL; unsigned int Spell::sRecordId = REC_SPEL;
Spell::Spell()
: mIsDeleted(false)
{}
void Spell::load(ESMReader &esm) void Spell::load(ESMReader &esm)
{ {
mEffects.mList.clear(); mEffects.mList.clear();

View file

@ -47,6 +47,8 @@ struct Spell
bool mIsDeleted; bool mIsDeleted;
Spell();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Static::sRecordId = REC_STAT; unsigned int Static::sRecordId = REC_STAT;
Static::Static()
: mIsDeleted(false)
{}
void Static::load(ESMReader &esm) void Static::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -30,6 +30,8 @@ struct Static
bool mIsDeleted; bool mIsDeleted;
Static();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;

View file

@ -9,6 +9,10 @@ namespace ESM
{ {
unsigned int Weapon::sRecordId = REC_WEAP; unsigned int Weapon::sRecordId = REC_WEAP;
Weapon::Weapon()
: mIsDeleted(false)
{}
void Weapon::load(ESMReader &esm) void Weapon::load(ESMReader &esm)
{ {
mId = esm.getHNString("NAME"); mId = esm.getHNString("NAME");

View file

@ -71,6 +71,8 @@ struct Weapon
bool mIsDeleted; bool mIsDeleted;
Weapon();
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;