From 749fd418b5157812dd40d789ecacbf29cf266bb7 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 17 May 2013 15:10:41 +0200
Subject: [PATCH] added missing columns for door record

---
 apps/opencs/model/world/refidadapterimp.cpp | 36 +++++++++++++++++++++
 apps/opencs/model/world/refidadapterimp.hpp | 18 +++++++++++
 apps/opencs/model/world/refidcollection.cpp |  8 ++++-
 apps/opencs/model/world/refidcollection.hpp |  1 -
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 1b54f2dad..10694a79e 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -286,4 +286,40 @@ void CSMWorld::CreatureRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
         else
             ActorRefIdAdapter<ESM::Creature>::setData (column, data, index, value);
     }
+}
+
+
+CSMWorld::DoorRefIdAdapter::DoorRefIdAdapter (const NameColumns& columns,
+    const RefIdColumn *openSound, const RefIdColumn *closeSound)
+: NameRefIdAdapter<ESM::Door> (UniversalId::Type_Door, columns), mOpenSound (openSound),
+  mCloseSound (closeSound)
+{}
+
+QVariant CSMWorld::DoorRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
+    int index) const
+{
+    const Record<ESM::Door>& record = static_cast<const Record<ESM::Door>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Door)));
+
+    if (column==mOpenSound)
+        return QString::fromUtf8 (record.get().mOpenSound.c_str());
+
+    if (column==mCloseSound)
+        return QString::fromUtf8 (record.get().mCloseSound.c_str());
+
+    return NameRefIdAdapter<ESM::Door>::getData (column, data, index);
+}
+
+void CSMWorld::DoorRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
+    const QVariant& value) const
+{
+    Record<ESM::Door>& record = static_cast<Record<ESM::Door>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Door)));
+
+    if (column==mOpenSound)
+        record.get().mOpenSound = value.toString().toUtf8().constData();
+    else if (column==mCloseSound)
+        record.get().mCloseSound = value.toString().toUtf8().constData();
+    else
+        NameRefIdAdapter<ESM::Door>::setData (column, data, index, value);
 }
\ No newline at end of file
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 328be0c6b..fa25331a4 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -642,6 +642,24 @@ namespace CSMWorld
                 const QVariant& value) const;
             ///< If the data type does not match an exception is thrown.
     };
+
+    class DoorRefIdAdapter : public NameRefIdAdapter<ESM::Door>
+    {
+            const RefIdColumn *mOpenSound;
+            const RefIdColumn *mCloseSound;
+
+        public:
+
+            DoorRefIdAdapter (const NameColumns& columns, const RefIdColumn *openSound,
+                const RefIdColumn *closeSound);
+
+            virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
+                const;
+
+            virtual void setData (const RefIdColumn *column, RefIdData& data, int index,
+                const QVariant& value) const;
+            ///< If the data type does not match an exception is thrown.
+    };
 }
 
 #endif
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 5fc479f4c..5667d0170 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -197,6 +197,12 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     creatureColumns.mFlags.insert (std::make_pair (respawn, ESM::Creature::Respawn));
 
+    mColumns.push_back (RefIdColumn ("Open Sound", ColumnBase::Display_String));
+    const RefIdColumn *openSound = &mColumns.back();
+
+    mColumns.push_back (RefIdColumn ("Close Sound", ColumnBase::Display_String));
+    const RefIdColumn *closeSound = &mColumns.back();
+
     mAdapters.insert (std::make_pair (UniversalId::Type_Activator,
         new NameRefIdAdapter<ESM::Activator> (UniversalId::Type_Activator, nameColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Potion,
@@ -214,7 +220,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mAdapters.insert (std::make_pair (UniversalId::Type_Creature,
         new CreatureRefIdAdapter (creatureColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Door,
-        new NameRefIdAdapter<ESM::Door> (UniversalId::Type_Door, nameColumns)));
+        new DoorRefIdAdapter (nameColumns, openSound, closeSound)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Ingredient,
         new InventoryRefIdAdapter<ESM::Ingredient> (UniversalId::Type_Ingredient, inventoryColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_CreatureLevelledList,
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index a55ad38a4..dc86c128c 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -89,7 +89,6 @@ namespace CSMWorld
 
             virtual int getAppendIndex (UniversalId::Type type) const;
             ///< \param type Will be ignored, unless the collection supports multiple record types
-
     };
 }