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

Minor cleanup

Browse source
This commit is contained in:
scrawl 2016-05-15 16:38:04 +02:00
parent 85b0c4393b
commit 04b537bf5f
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/esm/loaddial.cpp
View file

@ -77,9 +77,8 @@ namespace ESM
void Dialogue::readInfo(ESMReader &esm, bool merge) void Dialogue::readInfo(ESMReader &esm, bool merge)
{ {
ESM::DialInfo info; ESM::DialInfo info;
info.loadId(esm);
bool isDeleted = false; bool isDeleted = false;
info.loadData(esm, isDeleted); info.load(esm, isDeleted);
if (!merge || mInfo.empty()) if (!merge || mInfo.empty())
{ {

9
components/esm/loadinfo.cpp
View file

@ -9,18 +9,9 @@ namespace ESM
unsigned int DialInfo::sRecordId = REC_INFO; unsigned int DialInfo::sRecordId = REC_INFO;
void DialInfo::load(ESMReader &esm, bool &isDeleted) void DialInfo::load(ESMReader &esm, bool &isDeleted)
{
loadId(esm);
loadData(esm, isDeleted);
}
void DialInfo::loadId(ESMReader &esm)
{ {
mId = esm.getHNString("INAM"); mId = esm.getHNString("INAM");
}
void DialInfo::loadData(ESMReader &esm, bool &isDeleted)
{
isDeleted = false; isDeleted = false;
mQuestStatus = QS_None; mQuestStatus = QS_None;

6
components/esm/loadinfo.hpp
View file

@ -106,11 +106,7 @@ struct DialInfo
}; };
void load(ESMReader &esm, bool &isDeleted); void load(ESMReader &esm, bool &isDeleted);
///< Loads all sub-records of Info record ///< Loads Info record
void loadId(ESMReader &esm);
///< Loads only Id of Info record (INAM sub-record)
void loadData(ESMReader &esm, bool &isDeleted);
///< Loads all sub-records of Info record, except INAM sub-record
void save(ESMWriter &esm, bool isDeleted = false) const; void save(ESMWriter &esm, bool isDeleted = false) const;