added missing column for potions

apps/opencs/model/world/refidadapterimp.cpp

@@ -1,5 +1,32 @@
 
 #include "refidadapterimp.hpp"
 
+CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const InventoryColumns& columns,
+    const RefIdColumn *autoCalc)
+: InventoryRefIdAdapter<ESM::Potion> (UniversalId::Type_Potion, columns),
+  mAutoCalc (autoCalc)
+{}
 
+QVariant CSMWorld::PotionRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
+    int index) const
+{
+    const Record<ESM::Potion>& record = static_cast<const Record<ESM::Potion>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Potion)));
 
+    if (column==mAutoCalc)
+        return record.get().mData.mAutoCalc;
+
+    return InventoryRefIdAdapter<ESM::Potion>::getData (column, data, index);
+}
+
+void CSMWorld::PotionRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
+    const QVariant& value) const
+{
+    Record<ESM::Potion>& record = static_cast<Record<ESM::Potion>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Potion)));
+
+    if (column==mAutoCalc)
+        record.get().mData.mAutoCalc = value.toInt();
+    else
+        InventoryRefIdAdapter<ESM::Potion>::setData (column, data, index, value);
+}

apps/opencs/model/world/refidadapterimp.hpp

@@ -3,6 +3,8 @@
 
 #include <QVariant>
 
+#include <components/esm/loadalch.hpp>
+
 #include "record.hpp"
 #include "refiddata.hpp"
 #include "universalid.hpp"
@@ -279,6 +281,22 @@ namespace CSMWorld
         else
             NameRefIdAdapter<RecordT>::setData (column, data, index, value);
     }
+
+    class PotionRefIdAdapter : public InventoryRefIdAdapter<ESM::Potion>
+    {
+            const RefIdColumn *mAutoCalc;
+
+        public:
+
+            PotionRefIdAdapter (const InventoryColumns& columns, const RefIdColumn *autoCalc);
+
+            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

apps/opencs/model/world/refidcollection.cpp

@@ -67,10 +67,13 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn ("Value", ColumnBase::Display_Integer));
     inventoryColumns.mValue = &mColumns.back();
 
+    mColumns.push_back (RefIdColumn ("Auto Calc", ColumnBase::Display_Boolean));
+    const RefIdColumn *autoCalc = &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,
-        new InventoryRefIdAdapter<ESM::Potion> (UniversalId::Type_Potion, inventoryColumns)));
+        new PotionRefIdAdapter (inventoryColumns, autoCalc)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Apparatus,
         new InventoryRefIdAdapter<ESM::Apparatus> (UniversalId::Type_Apparatus, inventoryColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Armor,