From 8cf91e32fa4269f56e26a79767405e6104ce8818 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Apr 2016 21:37:26 +0200
Subject: [PATCH] ESSImport: Correctly handle item stacks (XIDX tag). (Fixes
 #3340)

---
 apps/essimporter/importinventory.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index 3ec640d3d5..2c87a9a19d 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -21,13 +21,18 @@ namespace ESSImport
             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?
-            // I guess we should double check the stacking logic in OpenMW
-            for (int i=0;i<std::abs(item.mCount);++i)
+            unsigned int itemCount = std::abs(item.mCount);
+            bool separateStacks = false;
+            for (unsigned int i=0;i<itemCount;++i)
             {
-                if (esm.isNextSub("XIDX")) // index in the stack?
-                    esm.skipHSub();
+                bool newStack = esm.isNextSub("XIDX");
+                if (newStack)
+                {
+                    unsigned int idx;
+                    esm.getHT(idx);
+                    separateStacks = true;
+                    item.mCount = 1;
+                }
 
                 item.mSCRI.load(esm);
 
@@ -38,9 +43,13 @@ namespace ESSImport
                 int charge=-1;
                 esm.getHNOT(charge, "XHLT");
                 item.mChargeInt = charge;
+
+                if (newStack)
+                    mItems.push_back(item);
             }
 
-            mItems.push_back(item);
+            if (!separateStacks)
+                mItems.push_back(item);
         }
 
         // equipped items