added missing columns for book record

apps/opencs/model/world/refidadapterimp.cpp

@@ -106,4 +106,39 @@ void CSMWorld::ArmorRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
         record.get().mData.mArmor = value.toInt();
     else
         EnchantableRefIdAdapter<ESM::Armor>::setData (column, data, index, value);
+}
+
+CSMWorld::BookRefIdAdapter::BookRefIdAdapter (const EnchantableColumns& columns,
+    const RefIdColumn *scroll, const RefIdColumn *skill)
+: EnchantableRefIdAdapter<ESM::Book> (UniversalId::Type_Book, columns),
+    mScroll (scroll), mSkill (skill)
+{}
+
+QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column,
+    const RefIdData& data, int index) const
+{
+    const Record<ESM::Book>& record = static_cast<const Record<ESM::Book>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Book)));
+
+    if (column==mScroll)
+        return record.get().mData.mIsScroll!=0;
+
+    if (column==mSkill)
+        return record.get().mData.mSkillID;
+
+    return EnchantableRefIdAdapter<ESM::Book>::getData (column, data, index);
+}
+
+void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
+    const QVariant& value) const
+{
+    Record<ESM::Book>& record = static_cast<Record<ESM::Book>&> (
+        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Book)));
+
+    if (column==mScroll)
+        record.get().mData.mIsScroll = value.toInt();
+    else if (column==mSkill)
+        record.get().mData.mSkillID = value.toInt();
+    else
+        EnchantableRefIdAdapter<ESM::Book>::setData (column, data, index, value);
 }

apps/opencs/model/world/refidadapterimp.hpp

@@ -562,6 +562,24 @@ namespace CSMWorld
                 const QVariant& value) const;
             ///< If the data type does not match an exception is thrown.
     };
+
+    class BookRefIdAdapter : public EnchantableRefIdAdapter<ESM::Book>
+    {
+            const RefIdColumn *mScroll;
+            const RefIdColumn *mSkill;
+
+        public:
+
+            BookRefIdAdapter (const EnchantableColumns& columns, const RefIdColumn *scroll,
+                const RefIdColumn *skill);
+
+            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

@@ -142,6 +142,12 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn ("Armor Value", ColumnBase::Display_Integer));
     const RefIdColumn *armor = &mColumns.back();
 
+    mColumns.push_back (RefIdColumn ("Scroll", ColumnBase::Display_Boolean));
+    const RefIdColumn *scroll = &mColumns.back();
+
+    mColumns.push_back (RefIdColumn ("Attribute", ColumnBase::Display_Attribute));
+    const RefIdColumn *attribute = &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,
@@ -151,7 +157,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mAdapters.insert (std::make_pair (UniversalId::Type_Armor,
         new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Book,
-        new EnchantableRefIdAdapter<ESM::Book> (UniversalId::Type_Book, enchantableColumns)));
+        new BookRefIdAdapter (enchantableColumns, scroll, attribute)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Clothing,
         new EnchantableRefIdAdapter<ESM::Clothing> (UniversalId::Type_Clothing, enchantableColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Container,