some cleanup and fixing

components/esm/loadglob.cpp

@@ -1,11 +1,7 @@
 #include "loadglob.hpp"
 
-#include "esmreader.hpp"
-#include "esmwriter.hpp"
-
 namespace ESM
 {
-
     void Global::load (ESMReader &esm)
     {
         mValue.read (esm, ESM::Variant::Format_Global);

components/esm/variant.cpp

@@ -37,7 +37,7 @@ ESM::VarType ESM::Variant::getType() const
     return mType;
 }
 
-std::string ESM::Variant::toString() const
+std::string ESM::Variant::getString() const
 {
     if (!mData)
         throw std::runtime_error ("can not convert empty variant to string");
@@ -80,6 +80,12 @@ void ESM::Variant::read (ESMReader& esm, Format format)
             esm.fail ("illegal global variable type " + typeId);
     }
     else // GMST
+    {
+        if (!esm.hasMoreSubs())
+        {
+            type = VT_None;
+        }
+        else
         {
             esm.getSubName();
             NAME name = esm.retSubName();
@@ -99,6 +105,7 @@ void ESM::Variant::read (ESMReader& esm, Format format)
             else
                 esm.fail ("invalid subrecord: " + name.toString());
         }
+    }
 
     setType (type);
 

components/esm/variant.hpp

@@ -45,7 +45,7 @@ namespace ESM
 
             VarType getType() const;
 
-            std::string toString() const;
+            std::string getString() const;
             ///< Will throw an exception, if value can not be represented as a string.
 
             int getInteger() const;