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

ESSImport: fix NPCC indices

Browse source
This commit is contained in:
scrawl 2015-01-20 20:18:30 +01:00
parent 5b705196bc
commit e38d756345
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/essimporter/converter.cpp
View file

@ -1,5 +1,7 @@
#include "converter.hpp" #include "converter.hpp"
#include <stdexcept>
#include <OgreImage.h> #include <OgreImage.h>
#include <components/esm/creaturestate.hpp> #include <components/esm/creaturestate.hpp>
@ -281,7 +283,9 @@ namespace ESSImport
continue; continue;
} }
std::cerr << "Can't find type for " << cellref.mIndexedRefId << std::endl; std::stringstream error;
error << "Can't find type for " << cellref.mIndexedRefId << std::endl;
throw std::runtime_error(error.str());
} }
} }

5
apps/essimporter/converter.hpp
View file

@ -170,13 +170,10 @@ public:
} }
else else
{ {
int index = mIndexCounter[id]++; int index = npcc.mNPDT.mIndex;
mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc)).second; mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc)).second;
} }
} }
private:
std::map<std::string, int> mIndexCounter;
}; };
class ConvertREFR : public Converter class ConvertREFR : public Converter

3
apps/essimporter/importnpcc.hpp
View file

@ -22,7 +22,8 @@ namespace ESSImport
unsigned char mDisposition; unsigned char mDisposition;
unsigned char unknown; unsigned char unknown;
unsigned char mReputation; unsigned char mReputation;
unsigned char unknown2[5]; unsigned char unknown2;
int mIndex;
} mNPDT; } mNPDT;
Inventory mInventory; Inventory mInventory;