From e47f9c7268c47d21deecde853739936c9287a934 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 27 Sep 2014 12:51:46 +0200
Subject: [PATCH] added first batch of magic effect columns (re-using existing
 columns)

---
 apps/opencs/model/world/columns.cpp | 2 ++
 apps/opencs/model/world/columns.hpp | 2 ++
 apps/opencs/model/world/data.cpp    | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 44d8755c1..f2ef0ffc2 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -188,6 +188,8 @@ namespace CSMWorld
             { ColumnId_RefNum, "RefNum" },
             { ColumnId_Creature, "Creature" },
             { ColumnId_SoundGeneratorType, "Sound Generator Type" },
+            { ColumnId_AllowSpellmaking, "Allow Spellmaking" },
+            { ColumnId_AllowEnchanting, "Allow Enchanting" },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index ea8a9200d..35d888b7e 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -181,6 +181,8 @@ namespace CSMWorld
             ColumnId_RefNum = 169,
             ColumnId_Creature = 170,
             ColumnId_SoundGeneratorType = 171,
+            ColumnId_AllowSpellmaking = 172,
+            ColumnId_AllowEnchanting = 173,
 
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index d17f667ab..da6cbca85 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -231,6 +231,14 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mMagicEffects.addColumn (new RecordStateColumn<ESM::MagicEffect>);
     mMagicEffects.addColumn (new FixedRecordTypeColumn<ESM::MagicEffect> (UniversalId::Type_MagicEffect));
 
+    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
+        Columns::ColumnId_AllowSpellmaking, ESM::MagicEffect::AllowSpellmaking));
+    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
+        Columns::ColumnId_AllowEnchanting, ESM::MagicEffect::AllowEnchanting));
+    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
+        Columns::ColumnId_NegativeLight, ESM::MagicEffect::NegativeLight));
+    mMagicEffects.addColumn (new DescriptionColumn<ESM::MagicEffect>);
+
     mRefs.addColumn (new StringIdColumn<CellRef> (true));
     mRefs.addColumn (new RecordStateColumn<CellRef>);
     mRefs.addColumn (new FixedRecordTypeColumn<CellRef> (UniversalId::Type_Reference));