mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2024-12-29 03:19:44 +00:00
Code Issues Projects Releases Wiki Activity

ESSImport: some fixes

Browse Source
This commit is contained in:
scrawl 2015-01-22 23:42:43 +01:00
parent 1d29180e00
commit c354f48a07
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/essimporter/importcrec.cpp
View File

@ -15,13 +15,8 @@ namespace ESSImport
esm.getHNOT(scale, "XSCL");
// FIXME: use AiPackageList, need to fix getSubName()
if (esm.isNextSub("AI_W"))
esm.skipHSub();
if (esm.isNextSub("AI_E"))
esm.skipHSub();
if (esm.isNextSub("AI_T"))
esm.skipHSub();
if (esm.isNextSub("AI_F"))
while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
|| esm.isNextSub("AI_A"))
esm.skipHSub();
mInventory.load(esm);

12
apps/essimporter/importdial.cpp
View File

@ -7,7 +7,17 @@ namespace ESSImport
void DIAL::load(ESM::ESMReader &esm)
{
esm.getHNT(mIndex, "XIDX");
// See ESM::Dialogue::Type enum, not sure why we would need this here though
int type = 0;
esm.getHNOT(type, "DATA");
// Deleted dialogue in a savefile. No clue what this means...
int deleted = 0;
esm.getHNOT(deleted, "DELE");
mIndex = 0;
// *should* always occur except when the dialogue is deleted, but leaving it optional just in case...
esm.getHNOT(mIndex, "XIDX");
}
}

9
apps/essimporter/importnpcc.cpp
View File

@ -10,13 +10,8 @@ namespace ESSImport
esm.getHNT(mNPDT, "NPDT");
// FIXME: use AiPackageList, need to fix getSubName()
if (esm.isNextSub("AI_W"))
esm.skipHSub();
if (esm.isNextSub("AI_E"))
esm.skipHSub();
if (esm.isNextSub("AI_T"))
esm.skipHSub();
if (esm.isNextSub("AI_F"))
while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
|| esm.isNextSub("AI_A"))
esm.skipHSub();
mInventory.load(esm);