From 6d5bb57e00ea23f573731f7ed15f31f928a76576 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 20 Jan 2015 01:21:44 +0100
Subject: [PATCH] ESSImport: fix loading item stacks in containers

---
 apps/essimporter/importinventory.cpp | 43 ++++++++++++++++------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index b3bd4a86b..b4d193540 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -18,28 +18,35 @@ namespace ESSImport
             item.mId = contItem.mItem.toString();
             item.mCount = contItem.mCount;
 
-            if (esm.isNextSub("XIDX"))
-                esm.skipHSub();
-
-            std::string script = esm.getHNOString("SCRI");
-            // script variables?
-            // unsure if before or after ESM::CellRef
-            if (!script.empty())
+            // 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)
             {
-                if (esm.isNextSub("SLCS"))
-                    esm.skipHSub();
-                if (esm.isNextSub("SLSD")) // Short Data?
+                if (esm.isNextSub("XIDX")) // index in the stack?
                     esm.skipHSub();
-                if (esm.isNextSub("SLFD")) // Float Data?
-                    esm.skipHSub();
-            }
 
-            // for XSOL and XCHG seen so far, but probably others too
-            item.ESM::CellRef::loadData(esm);
+                std::string script = esm.getHNOString("SCRI");
+                // script variables?
+                // unsure if before or after ESM::CellRef
+                if (!script.empty())
+                {
+                    if (esm.isNextSub("SLCS"))
+                        esm.skipHSub();
+                    if (esm.isNextSub("SLSD")) // Short Data?
+                        esm.skipHSub();
+                    if (esm.isNextSub("SLFD")) // Float Data?
+                        esm.skipHSub();
+                }
+
+                // for XSOL and XCHG seen so far, but probably others too
+                item.ESM::CellRef::loadData(esm);
+
+                item.mCondition = -1;
+                // FIXME: for Lights, this is actually a float
+                esm.getHNOT(item.mCondition, "XHLT");
+            }
 
-            item.mCondition = -1;
-            // FIXME: for Lights, this is actually a float
-            esm.getHNOT(item.mCondition, "XHLT");
             mItems.push_back(item);
         }