1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-19 15:39:49 +00:00

ESSImport: stolen items reading fix

This commit is contained in:
scrawl 2015-01-22 15:21:03 +01:00
parent 378e91545d
commit af0e91c2d3

View file

@ -364,15 +364,18 @@ public:
{
std::string itemid = esm.getHNString("NAME");
while (esm.isNextSub("ONAM"))
while (esm.isNextSub("FNAM") || esm.isNextSub("ONAM"))
{
std::string ownerid = esm.getHString();
mStolenItems.insert(std::make_pair(itemid, ownerid));
}
while (esm.isNextSub("FNAM"))
{
std::string factionid = esm.getHString();
mFactionStolenItems.insert(std::make_pair(itemid, factionid));
if (esm.retSubName().toString() == "FNAM")
{
std::string factionid = esm.getHString();
mFactionStolenItems.insert(std::make_pair(itemid, factionid));
}
else
{
std::string ownerid = esm.getHString();
mStolenItems.insert(std::make_pair(itemid, ownerid));
}
}
}
private: