From 7ead963075c0ef0ff036dec10531367548ae4a56 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 23 Jan 2015 15:33:30 +0100
Subject: [PATCH] Revert "Revert "ESSImport: convert inventory equipment
 slots""

This reverts commit fe31ca0ac0649a0e34617a5821454e04863531ca.
---
 apps/essimporter/convertinventory.cpp |  2 +-
 apps/essimporter/importinventory.cpp  | 12 +++++++++++-
 apps/essimporter/importinventory.hpp  |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/essimporter/convertinventory.cpp b/apps/essimporter/convertinventory.cpp
index 42535d946..6a31be6a3 100644
--- a/apps/essimporter/convertinventory.cpp
+++ b/apps/essimporter/convertinventory.cpp
@@ -16,7 +16,7 @@ namespace ESSImport
             objstate.mCount = std::abs(it->mCount); // restocking items have negative count in the savefile
                                                     // openmw handles them differently, so no need to set any flags
             objstate.mRef.mCharge = it->mCondition;
-            state.mItems.push_back(std::make_pair(objstate, -1));
+            state.mItems.push_back(std::make_pair(objstate, it->mRelativeEquipmentSlot));
         }
     }
 
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index b4d193540..2f5c3c054 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -1,5 +1,7 @@
 #include "importinventory.hpp"
 
+#include <stdexcept>
+
 #include <components/esm/esmreader.hpp>
 
 #include <components/esm/loadcont.hpp>
@@ -17,6 +19,7 @@ namespace ESSImport
             InventoryItem item;
             item.mId = contItem.mItem.toString();
             item.mCount = contItem.mCount;
+            item.mRelativeEquipmentSlot = -1;
 
             // seems that a stack of items can have a set of subrecords for each item? rings0000.ess
             // doesn't make any sense to me, if the values were different then the items shouldn't stack in the first place?
@@ -55,14 +58,21 @@ namespace ESSImport
         {
             // note: same item can be equipped 2 items (e.g. 2 rings)
             // and will be *stacked* in the NPCO list, unlike openmw!
+            // this is currently not handled properly.
+
             esm.getSubHeader();
             int itemIndex; // index of the item in the NPCO list
             esm.getT(itemIndex);
 
+            if (itemIndex < 0 || itemIndex >= int(mItems.size()))
+                esm.fail("equipment item index out of range");
+
             // appears to be a relative index for only the *possible* slots this item can be equipped in,
-            // i.e. 0 most of the time, unlike openmw slot enum index
+            // i.e. 0 most of the time
             int slotIndex;
             esm.getT(slotIndex);
+
+            mItems[itemIndex].mRelativeEquipmentSlot = slotIndex;
         }
     }
 
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index 359e43fa6..8a1594465 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -21,6 +21,7 @@ namespace ESSImport
             std::string mId;
             int mCount;
             int mCondition;
+            int mRelativeEquipmentSlot;
         };
         std::vector<InventoryItem> mItems;