diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp index 592444505..f06b42250 100644 --- a/components/esm/loaddial.cpp +++ b/components/esm/loaddial.cpp @@ -77,9 +77,8 @@ namespace ESM void Dialogue::readInfo(ESMReader &esm, bool merge) { ESM::DialInfo info; - info.loadId(esm); bool isDeleted = false; - info.loadData(esm, isDeleted); + info.load(esm, isDeleted); if (!merge || mInfo.empty()) { diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp index ee6d15708..38bb163e6 100644 --- a/components/esm/loadinfo.cpp +++ b/components/esm/loadinfo.cpp @@ -9,18 +9,9 @@ namespace ESM unsigned int DialInfo::sRecordId = REC_INFO; void DialInfo::load(ESMReader &esm, bool &isDeleted) - { - loadId(esm); - loadData(esm, isDeleted); - } - - void DialInfo::loadId(ESMReader &esm) { mId = esm.getHNString("INAM"); - } - void DialInfo::loadData(ESMReader &esm, bool &isDeleted) - { isDeleted = false; mQuestStatus = QS_None; diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp index 8123a9ace..2fbc782ec 100644 --- a/components/esm/loadinfo.hpp +++ b/components/esm/loadinfo.hpp @@ -106,11 +106,7 @@ struct DialInfo }; void load(ESMReader &esm, bool &isDeleted); - ///< Loads all sub-records of 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 + ///< Loads Info record void save(ESMWriter &esm, bool isDeleted = false) const;