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

Some fixes for ESM Dialogues and Infos

Browse source
This commit is contained in:
Stanislav Bas 2015-07-11 22:17:53 +03:00
parent 7ecb54a776
commit e0983c815c
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwworld/store.hpp
View file

@ -371,7 +371,8 @@ namespace MWWorld
} }
else else
{ {
found->second = dialogue; found->second.mIsDeleted = dialogue.mIsDeleted;
found->second.mType = dialogue.mType;
} }
mLastAddedRecord = dialogue; mLastAddedRecord = dialogue;

2
components/esm/loaddial.cpp
View file

@ -32,6 +32,7 @@ namespace ESM
int32_t empty; int32_t empty;
esm.getT(empty); // Skip an empty DATA esm.getT(empty); // Skip an empty DATA
mIsDeleted = readDeleSubRecord(esm); mIsDeleted = readDeleSubRecord(esm);
mType = Unknown;
} }
else else
esm.fail("Unknown sub record size"); esm.fail("Unknown sub record size");
@ -54,6 +55,7 @@ namespace ESM
void Dialogue::blank() void Dialogue::blank()
{ {
mInfo.clear(); mInfo.clear();
mIsDeleted = false;
} }
void Dialogue::readInfo(ESMReader &esm, bool merge) void Dialogue::readInfo(ESMReader &esm, bool merge)

3
components/esm/loaddial.hpp
View file

@ -30,7 +30,8 @@ struct Dialogue
Voice = 1, Voice = 1,
Greeting = 2, Greeting = 2,
Persuasion = 3, Persuasion = 3,
Journal = 4 Journal = 4,
Unknown = -1 // Used for deleted dialogues
}; };
std::string mId; std::string mId;

3
components/esm/loadinfo.cpp
View file

@ -17,6 +17,7 @@ namespace ESM
{ {
mQuestStatus = QS_None; mQuestStatus = QS_None;
mFactionLess = false; mFactionLess = false;
mIsDeleted = false;
mPrev = esm.getHNString("PNAM"); mPrev = esm.getHNString("PNAM");
mNext = esm.getHNString("NNAM"); mNext = esm.getHNString("NNAM");
@ -142,6 +143,7 @@ namespace ESM
{ {
esm.writeHNCString("PNAM", mPrev); esm.writeHNCString("PNAM", mPrev);
esm.writeHNCString("NNAM", mNext); esm.writeHNCString("NNAM", mNext);
if (mIsDeleted) if (mIsDeleted)
{ {
esm.writeHNCString("NAME", mResponse); esm.writeHNCString("NAME", mResponse);
@ -200,5 +202,6 @@ namespace ESM
mResultScript.clear(); mResultScript.clear();
mFactionLess = false; mFactionLess = false;
mQuestStatus = QS_None; mQuestStatus = QS_None;
mIsDeleted = false;
} }
} }