basic gmst support

apps/opencs/model/world/data.cpp

@@ -28,7 +28,13 @@ CSMWorld::Data::Data()
     mGlobals.addColumn (new FixedRecordTypeColumn<ESM::Global> (UniversalId::Type_Global));
     mGlobals.addColumn (new FloatValueColumn<ESM::Global>);
 
+    mGmsts.addColumn (new StringIdColumn<ESM::GameSetting>);
+    mGmsts.addColumn (new RecordStateColumn<ESM::GameSetting>);
+    mGmsts.addColumn (new FixedRecordTypeColumn<ESM::GameSetting> (UniversalId::Type_Gmst));
+    ///< \todo add type and value
+
     addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);
+    addModel (new IdTable (&mGmsts), UniversalId::Type_Gmsts, UniversalId::Type_Gmst);
 }
 
 CSMWorld::Data::~Data()
@@ -78,6 +84,7 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
         switch (n.val)
         {
             case ESM::REC_GLOB: mGlobals.load (reader, base); break;
+            case ESM::REC_GMST: mGmsts.load (reader, base); break;
 
 
             default:

apps/opencs/model/world/data.hpp

@@ -7,6 +7,7 @@
 #include <boost/filesystem/path.hpp>
 
 #include <components/esm/loadglob.hpp>
+#include <components/esm/loadgmst.hpp>
 
 #include "idcollection.hpp"
 #include "universalid.hpp"
@@ -18,6 +19,7 @@ namespace CSMWorld
     class Data
     {
             IdCollection<ESM::Global> mGlobals;
+            IdCollection<ESM::GameSetting> mGmsts;
             std::vector<QAbstractTableModel *> mModels;
             std::map<UniversalId::Type, QAbstractTableModel *> mModelIndex;
 

apps/opencs/model/world/universalid.cpp

@@ -18,6 +18,7 @@ namespace
     {
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, "empty" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Globals, "Global Variables" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Gmsts, "Game Settings" },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
     };
@@ -25,6 +26,7 @@ namespace
     static const TypeData sIdArg[] =
     {
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting" },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
     };

apps/opencs/model/world/universalid.hpp

@@ -33,12 +33,12 @@ namespace CSMWorld
             enum Type
             {
                 Type_None,
-
                 Type_Globals,
-
                 Type_Global,
+                Type_VerificationResults,
+                Type_Gmsts,
+                Type_Gmst
 
-                Type_VerificationResults
             };
 
         private:

apps/opencs/view/doc/view.cpp

@@ -71,6 +71,10 @@ void CSVDoc::View::setupWorldMenu()
     connect (globals, SIGNAL (triggered()), this, SLOT (addGlobalsSubView()));
     world->addAction (globals);
 
+    QAction *gmsts = new QAction (tr ("Game settings"), this);
+    connect (gmsts, SIGNAL (triggered()), this, SLOT (addGmstsSubView()));
+    world->addAction (gmsts);
+
     mVerify = new QAction (tr ("&Verify"), this);
     connect (mVerify, SIGNAL (triggered()), this, SLOT (verify()));
     world->addAction (mVerify);
@@ -218,3 +222,8 @@ void CSVDoc::View::addGlobalsSubView()
 {
     addSubView (CSMWorld::UniversalId::Type_Globals);
 }
+
+void CSVDoc::View::addGmstsSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Gmsts);
+}

apps/opencs/view/doc/view.hpp

@@ -99,6 +99,8 @@ namespace CSVDoc
             void verify();
 
             void addGlobalsSubView();
+
+            void addGmstsSubView();
     };
 }
 

apps/opencs/view/world/subviews.cpp

@@ -11,6 +11,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_Globals,
         new CSVDoc::SubViewFactoryWithCreateFlag<TableSubView> (true));
 
+    manager.add (CSMWorld::UniversalId::Type_Gmsts,
+        new CSVDoc::SubViewFactoryWithCreateFlag<TableSubView> (false));
+
     manager.add (CSMWorld::UniversalId::Type_Global,
         new CSVDoc::SubViewFactoryWithCreateFlag<DialogueSubView> (true));
 }

components/esm/loadgmst.cpp

@@ -80,4 +80,25 @@ std::string GameSetting::getString() const
     throw std::runtime_error ("GMST " + mId + " is not a string");
 }
 
+    void GameSetting::blank()
+    {
+        mStr.clear();
+        mI = 0;
+        mF = 0;
+        mType = VT_Float;
+    }
+
+    bool operator== (const GameSetting& left, const GameSetting& right)
+    {
+        if (left.mType!=right.mType)
+            return false;
+
+        switch (left.mType)
+        {
+            case VT_Float: return left.mF==right.mF;
+            case VT_Int: return left.mI==right.mI;
+            case VT_String: return left.mStr==right.mStr;
+            default: return false;
+        }
+    }
 }

components/esm/loadgmst.hpp

@@ -37,6 +37,11 @@ struct GameSetting
     ///< Throwns an exception if GMST is not of type string.
 
     void save(ESMWriter &esm);
+
+    void blank();
+    ///< Set record to default state (does not touch the ID).
 };
+
+    bool operator== (const GameSetting& left, const GameSetting& right);
 }
 #endif