From 182017b8e92c6259bed6ceab4f47b098152a671f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 13 Jul 2012 13:01:30 +0200
Subject: [PATCH] Issue #314: Moved ingredients and potions to a different type
 of record list

---
 apps/esmtool/esmtool.cpp       | 2 +-
 components/esm/loadalch.cpp    | 4 +++-
 components/esm/loadalch.hpp    | 4 +++-
 components/esm/loadingr.cpp    | 4 +++-
 components/esm/loadingr.hpp    | 4 +++-
 components/esm_store/store.hpp | 4 ++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index f417d5c60..4888d3ceb 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -187,7 +187,7 @@ int main(int argc, char**argv)
         case REC_ALCH:
           {
             Potion p;
-            p.load(esm);
+            p.load(esm, id);
             if(quiet) break;
             cout << "  Name: " << p.name << endl;
             break;
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index d3bc36a77..cd36887b0 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -2,8 +2,10 @@
 
 namespace ESM
 {
-void Potion::load(ESMReader &esm)
+void Potion::load(ESMReader &esm, const std::string& id)
 {
+    mId = id;
+
     model = esm.getHNString("MODL");
     icon = esm.getHNOString("TEXT"); // not ITEX here for some reason
     script = esm.getHNOString("SCRI");
diff --git a/components/esm/loadalch.hpp b/components/esm/loadalch.hpp
index c21e5dea0..6917fb448 100644
--- a/components/esm/loadalch.hpp
+++ b/components/esm/loadalch.hpp
@@ -24,7 +24,9 @@ struct Potion
     std::string name, model, icon, script;
     EffectList effects;
 
-    void load(ESMReader &esm);
+    std::string mId;
+
+    void load(ESMReader &esm, const std::string& id);
 };
 }
 #endif
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index 471f71780..a745ff669 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -3,8 +3,10 @@
 namespace ESM
 {
 
-void Ingredient::load(ESMReader &esm)
+void Ingredient::load(ESMReader &esm, const std::string& id)
 {
+    mId = id;
+
     model = esm.getHNString("MODL");
     name = esm.getHNString("FNAM");
     esm.getHNT(data, "IRDT", 56);
diff --git a/components/esm/loadingr.hpp b/components/esm/loadingr.hpp
index af9599ed0..5c1c3bd75 100644
--- a/components/esm/loadingr.hpp
+++ b/components/esm/loadingr.hpp
@@ -24,7 +24,9 @@ struct Ingredient
     IRDTstruct data;
     std::string name, model, icon, script;
 
-    void load(ESMReader &esm);
+    std::string mId;
+
+    void load(ESMReader &esm, const std::string& id);
 };
 }
 #endif
diff --git a/components/esm_store/store.hpp b/components/esm_store/store.hpp
index 507196a86..991925bd4 100644
--- a/components/esm_store/store.hpp
+++ b/components/esm_store/store.hpp
@@ -30,7 +30,7 @@ namespace ESMS
 
     // Each individual list
     RecListT<Activator>         activators;
-    RecListT<Potion>            potions;
+    RecListWithIDT<Potion>      potions;
     RecListT<Apparatus>         appas;
     RecListT<Armor>             armors;
     RecListT<BodyPart>          bodyParts;
@@ -47,7 +47,7 @@ namespace ESMS
     RecListT<Enchantment>       enchants;
     RecListT<Faction>           factions;
     RecListT<Global>            globals;
-    RecListT<Ingredient>        ingreds;
+    RecListWithIDT<Ingredient>  ingreds;
     RecListT<CreatureLevList>   creatureLists;
     RecListT<ItemLevList>       itemLists;
     RecListT<Light>             lights;