mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

Improve INFO struct naming

Browse source
This commit is contained in:
scrawl 2015-01-27 02:21:53 +01:00
parent 4cbb79191f
commit 6367b4dc0b
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/record.cpp
View file

@ -754,7 +754,7 @@ void Record<ESM::DialInfo>::print()
if (mData.mCell != "") if (mData.mCell != "")
std::cout << " Cell: " << mData.mCell << std::endl; std::cout << " Cell: " << mData.mCell << std::endl;
if (mData.mData.mDisposition > 0) if (mData.mData.mDisposition > 0)
std::cout << " Disposition: " << mData.mData.mDisposition << std::endl; std::cout << " Disposition/Journal index: " << mData.mData.mDisposition << std::endl;
if (mData.mData.mGender != ESM::DialInfo::NA) if (mData.mData.mGender != ESM::DialInfo::NA)
std::cout << " Gender: " << mData.mData.mGender << std::endl; std::cout << " Gender: " << mData.mData.mGender << std::endl;
if (mData.mSound != "") if (mData.mSound != "")

2
apps/openmw/mwdialogue/journalentry.cpp
View file

@ -89,7 +89,7 @@ namespace MWDialogue
for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin()); for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
iter!=dialogue->mInfo.end(); ++iter) iter!=dialogue->mInfo.end(); ++iter)
if (iter->mData.mDisposition==index) /// \todo cleanup info structure if (iter->mData.mJournalIndex==index)
{ {
return iter->mId; return iter->mId;
} }

2
apps/openmw/mwdialogue/quest.cpp
View file

@ -75,7 +75,7 @@ namespace MWDialogue
iter!=dialogue->mInfo.end(); ++iter) iter!=dialogue->mInfo.end(); ++iter)
if (iter->mId == entry.mInfoId) if (iter->mId == entry.mInfoId)
{ {
index = iter->mData.mDisposition; /// \todo cleanup info structure index = iter->mData.mJournalIndex;
break; break;
} }

6
components/esm/loadinfo.hpp
View file

@ -32,7 +32,11 @@ struct DialInfo
struct DATAstruct struct DATAstruct
{ {
int mUnknown1; int mUnknown1;
int mDisposition; union
{
int mDisposition; // Used for dialogue responses
int mJournalIndex; // Used for journal entries
};
signed char mRank; // Rank of NPC signed char mRank; // Rank of NPC
signed char mGender; // See Gender enum signed char mGender; // See Gender enum
signed char mPCrank; // Player rank signed char mPCrank; // Player rank