added var type column to globals

apps/opencs/model/doc/document.cpp

@@ -152,7 +152,7 @@ void CSMDoc::Document::addOptionalGlobals()
     {
         ESM::Global global;
         global.mId = sGlobals[i];
-        global.mValue.setType (ESM::VT_Int);
+        global.mValue.setType (ESM::VT_Long);
         addOptionalGlobal (global);
     }
 }

apps/opencs/model/world/columnbase.hpp

@@ -30,7 +30,8 @@ namespace CSMWorld
             Display_Integer,
             Display_Float,
             Display_Var,
-            Display_VarType
+            Display_GmstVarType,
+            Display_GlobalVarType
         };
 
         std::string mTitle;

apps/opencs/model/world/columns.hpp

@@ -96,7 +96,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct VarTypeColumn : public Column<ESXRecordT>
     {
-        VarTypeColumn() : Column<ESXRecordT> ("Type", ColumnBase::Display_VarType) {}
+        VarTypeColumn (ColumnBase::Display display) : Column<ESXRecordT> ("Type", display) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
@@ -125,9 +125,19 @@ namespace CSMWorld
         {
             switch (record.get().mValue.getType())
             {
-                case ESM::VT_String: return record.get().mValue.getString().c_str(); break;
+                case ESM::VT_String:
-                case ESM::VT_Int: return record.get().mValue.getInteger(); break;
+
-                case ESM::VT_Float: return record.get().mValue.getFloat(); break;
+                    return record.get().mValue.getString().c_str(); break;
+
+                case ESM::VT_Int:
+                case ESM::VT_Short:
+                case ESM::VT_Long:
+
+                    return record.get().mValue.getInteger(); break;
+
+                case ESM::VT_Float:
+
+                    return record.get().mValue.getFloat(); break;
 
                 default: return QVariant();
             }
@@ -145,6 +155,8 @@ namespace CSMWorld
                     break;
 
                 case ESM::VT_Int:
+                case ESM::VT_Short:
+                case ESM::VT_Long:
 
                     record2.mValue.setInteger (data.toInt());
                     break;

apps/opencs/model/world/data.cpp

@@ -27,12 +27,13 @@ CSMWorld::Data::Data()
     mGlobals.addColumn (new StringIdColumn<ESM::Global>);
     mGlobals.addColumn (new RecordStateColumn<ESM::Global>);
     mGlobals.addColumn (new FixedRecordTypeColumn<ESM::Global> (UniversalId::Type_Global));
-    mGlobals.addColumn (new FloatValueColumn<ESM::Global>);
+    mGlobals.addColumn (new VarTypeColumn<ESM::Global> (ColumnBase::Display_GlobalVarType));
+    mGlobals.addColumn (new VarValueColumn<ESM::Global>);
 
     mGmsts.addColumn (new StringIdColumn<ESM::GameSetting>);
     mGmsts.addColumn (new RecordStateColumn<ESM::GameSetting>);
     mGmsts.addColumn (new FixedRecordTypeColumn<ESM::GameSetting> (UniversalId::Type_Gmst));
-    mGmsts.addColumn (new VarTypeColumn<ESM::GameSetting>);
+    mGmsts.addColumn (new VarTypeColumn<ESM::GameSetting> (ColumnBase::Display_GmstVarType));
     mGmsts.addColumn (new VarValueColumn<ESM::GameSetting>);
 
     addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);

apps/opencs/view/doc/viewmanager.cpp

@@ -35,8 +35,12 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
 {
     mDelegateFactories = new CSVWorld::CommandDelegateFactoryCollection;
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_VarType,
+    mDelegateFactories->add (CSMWorld::ColumnBase::Display_GmstVarType,
         new CSVWorld::VarTypeDelegateFactory (ESM::VT_None, ESM::VT_String, ESM::VT_Int, ESM::VT_Float));
+
+    mDelegateFactories->add (CSMWorld::ColumnBase::Display_GlobalVarType,
+        new CSVWorld::VarTypeDelegateFactory (ESM::VT_Short, ESM::VT_Long, ESM::VT_Float));
+
 }
 
 CSVDoc::ViewManager::~ViewManager()

apps/opencs/view/world/vartypedelegate.cpp

@@ -85,7 +85,7 @@ void CSVWorld::VarTypeDelegateFactory::add (ESM::VarType type)
     {
         { ESM::VT_None, "empty" },
         { ESM::VT_Short, "short" },
-        { ESM::VT_Int, "long" },
+        { ESM::VT_Int, "integer" },
         { ESM::VT_Long, "long" },
         { ESM::VT_Float, "float" },
         { ESM::VT_String, "string" },