From f2ab4c929daa35d7401a5347e06bd83f4fb7b210 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 13 Sep 2012 09:26:17 +0200
Subject: [PATCH] Issue #356: added hardcoded magic effect flags *grumble*

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

diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index 2eda67b61..9aa6b26e3 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -1,5 +1,30 @@
 #include "loadmgef.hpp"
 
+namespace
+{
+    const int NumberOfHardcodedFlags = 143;
+    const int HardcodedFlags[NumberOfHardcodedFlags] = {
+        0x11c8, 0x11c0, 0x11c8, 0x11e0, 0x11e0, 0x11e0, 0x11e0, 0x11d0,
+        0x11c0, 0x11c0, 0x11e0, 0x11c0, 0x11184, 0x11184, 0x1f0, 0x1f0,
+        0x1f0, 0x11d2, 0x11f0, 0x11d0, 0x11d0, 0x11d1, 0x1d2, 0x1f0,
+        0x1d0, 0x1d0, 0x1d1, 0x1f0, 0x11d0, 0x11d0, 0x11d0, 0x11d0,
+        0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x1d0, 0x1d0, 0x11c8,
+        0x31c0, 0x11c0, 0x11c0, 0x11c0, 0x1180, 0x11d8, 0x11d8, 0x11d0,
+        0x11d0, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180,
+        0x11180, 0x11c4, 0x111b8, 0x1040, 0x104c, 0x104c, 0x104c, 0x104c,
+        0x1040, 0x1040, 0x1040, 0x11c0, 0x11c0, 0x1cc, 0x1cc, 0x1cc,
+        0x1cc, 0x1cc, 0x1c2, 0x1c0, 0x1c0, 0x1c0, 0x1c1, 0x11c2,
+        0x11c0, 0x11c0, 0x11c0, 0x11c1, 0x11c0, 0x21192, 0x20190, 0x20190,
+        0x20190, 0x21191, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0,
+        0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x1c0, 0x11190, 0x9048, 0x9048,
+        0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048,
+        0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x11c0, 0x1180, 0x1180,
+        0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x1188, 0x5048,
+        0x5048, 0x5048, 0x5048, 0x5048, 0x1048, 0x104c, 0x1048, 0x40,
+        0x11c8, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048
+    };
+}
+
 namespace ESM
 {
 
@@ -8,6 +33,10 @@ void MagicEffect::load(ESMReader &esm)
   esm.getHNT(index, "INDX");
 
   esm.getHNT(data, "MEDT", 36);
+  
+  if (index>=0 && index<NumberOfHardcodedFlags)
+    data.flags |= HardcodedFlags[index];
+  
   icon = esm.getHNOString("ITEX");
   particle = esm.getHNOString("PTEX");
 
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index b0b330aeb..0c224f5e0 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -10,6 +10,7 @@ struct MagicEffect
 {
     enum Flags
     {
+        NoDuration = 0x4,
         SpellMaking = 0x0200,
         Enchanting = 0x0400,
         Negative = 0x0800 // A harmful effect. Will determine whether