From 850dbb55a537ffebc66db873dd39de946c43aebe Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 26 Sep 2014 13:36:54 +0200
Subject: [PATCH] improved magic effect IDs

---
 components/esm/loadmgef.cpp | 29 +++++++++++++++++++++++++++--
 components/esm/loadmgef.hpp |  2 ++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index e6951b5c9..cbdca3e31 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -1,6 +1,7 @@
 #include "loadmgef.hpp"
 
 #include <stdexcept>
+#include <sstream>
 
 #include <boost/lexical_cast.hpp>
 
@@ -192,8 +193,7 @@ void MagicEffect::load(ESMReader &esm)
 {
   esm.getHNT(mIndex, "INDX");
 
-    if (mIndex>=0 && mIndex<Length)
-        mId = sIds[mIndex];
+    mId = indexToId (mIndex);
 
   esm.getHNT(mData, "MEDT", 36);
   if (esm.getFormat() == 0)
@@ -564,4 +564,29 @@ MagicEffect::MagnitudeDisplayType MagicEffect::getMagnitudeDisplayType() const {
         mAreaSound.clear();
         mDescription.clear();
     }
+
+    std::string MagicEffect::indexToId (int index)
+    {
+        std::ostringstream stream;
+
+        if (index!=-1)
+        {
+            stream << "#";
+
+            if (index<100)
+            {
+                stream << "0";
+
+                if (index<10)
+                    stream << "0";
+            }
+
+            stream << index;
+
+            if (index>=0 && index<Length)
+                stream << sIds[index];
+        }
+
+        return stream.str();
+    }
 }
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index 108f966c5..4c7ac938a 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -252,6 +252,8 @@ struct MagicEffect
 
         Length
     };
+
+    static std::string indexToId (int index);
 };
 }
 #endif