From e38d75634505ea77173d492ee90fff5e0a347128 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 20 Jan 2015 20:18:30 +0100
Subject: [PATCH] ESSImport: fix NPCC indices

---
 apps/essimporter/converter.cpp  | 6 +++++-
 apps/essimporter/converter.hpp  | 5 +----
 apps/essimporter/importnpcc.hpp | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 83ea077ea..099987762 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -1,5 +1,7 @@
 #include "converter.hpp"
 
+#include <stdexcept>
+
 #include <OgreImage.h>
 
 #include <components/esm/creaturestate.hpp>
@@ -281,7 +283,9 @@ namespace ESSImport
                     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());
             }
         }
 
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 920e6eead..b68f9a218 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -170,13 +170,10 @@ public:
         }
         else
         {
-            int index = mIndexCounter[id]++;
+            int index = npcc.mNPDT.mIndex;
             mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc)).second;
         }
     }
-
-private:
-    std::map<std::string, int> mIndexCounter;
 };
 
 class ConvertREFR : public Converter
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index ee8eccda2..c69fa3e03 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -22,7 +22,8 @@ namespace ESSImport
             unsigned char mDisposition;
             unsigned char unknown;
             unsigned char mReputation;
-            unsigned char unknown2[5];
+            unsigned char unknown2;
+            int mIndex;
         } mNPDT;
 
         Inventory mInventory;