ESSImport: convert running global scripts

apps/essimporter/CMakeLists.txt

@@ -24,6 +24,7 @@ set(ESSIMPORTER_FILES
     convertcrec.cpp
     convertcntc.cpp
     convertscri.cpp
+    convertscpt.cpp
 )
 
 add_executable(openmw-essimporter

apps/essimporter/converter.hpp

@@ -14,6 +14,7 @@
 #include <components/esm/custommarkerstate.hpp>
 #include <components/esm/loadcrea.hpp>
 #include <components/esm/weatherstate.hpp>
+#include <components/esm/globalscript.hpp>
 
 #include "importcrec.hpp"
 #include "importcntc.hpp"
@@ -30,6 +31,7 @@
 
 #include "convertacdt.hpp"
 #include "convertnpcc.hpp"
+#include "convertscpt.hpp"
 
 namespace ESSImport
 {
@@ -529,7 +531,21 @@ public:
     {
         SCPT script;
         script.load(esm);
+        ESM::GlobalScript out;
+        convertSCPT(script, out);
+        mScripts.push_back(out);
     }
+    virtual void write(ESM::ESMWriter &esm)
+    {
+        for (std::vector<ESM::GlobalScript>::const_iterator it = mScripts.begin(); it != mScripts.end(); ++it)
+        {
+            esm.startRecord(ESM::REC_GSCR);
+            it->save(esm);
+            esm.endRecord(ESM::REC_GSCR);
+        }
+    }
+private:
+    std::vector<ESM::GlobalScript> mScripts;
 };
 
 }

apps/essimporter/convertscpt.cpp

@@ -0,0 +1,17 @@
+#include "convertscpt.hpp"
+
+#include <components/misc/stringops.hpp>
+
+#include "convertscri.hpp"
+
+namespace ESSImport
+{
+
+    void convertSCPT(const SCPT &scpt, ESM::GlobalScript &out)
+    {
+        out.mId = Misc::StringUtils::lowerCase(scpt.mSCHD.mName.toString());
+        out.mRunning = scpt.mHasRNAM;
+        convertSCRI(scpt.mSCRI, out.mLocals);
+    }
+
+}

apps/essimporter/convertscpt.hpp

@@ -0,0 +1,15 @@
+#ifndef OPENMW_ESSIMPORT_CONVERTSCPT_H
+#define OPENMW_ESSIMPORT_CONVERTSCPT_H
+
+#include <components/esm/globalscript.hpp>
+
+#include "importscpt.hpp"
+
+namespace ESSImport
+{
+
+void convertSCPT(const SCPT& scpt, ESM::GlobalScript& out);
+
+}
+
+#endif

apps/essimporter/importscpt.cpp

@@ -14,7 +14,13 @@ namespace ESSImport
         mSCRI.load(esm);
 
         mRNAM = -1;
-        esm.getHNOT(mRNAM, "RNAM");
+        if (esm.isNextSub("RNAM"))
+        {
+            mHasRNAM = true;
+            esm.getHT(mRNAM);
+        }
+        else
+            mHasRNAM = false;
     }
 
 }

apps/essimporter/importscpt.hpp

@@ -22,6 +22,7 @@ namespace ESSImport
         // values of local variables
         SCRI mSCRI;
 
+        bool mHasRNAM;
         int mRNAM; // unknown, seems to be -1 for some scripts, some huge integer for others
 
         void load(ESM::ESMReader& esm);

components/esm/globalscript.hpp

@@ -12,7 +12,7 @@ namespace ESM
 
     struct GlobalScript
     {
-        std::string mId;
+        std::string mId; /// \note must be lowercase
         Locals mLocals;
         int mRunning;
         std::string mTargetId; // for targeted scripts