Merge branch 'esm4_cleanup' into 'master'

ESM4 cleanup

See merge request OpenMW/openmw!1792

apps/openmw_test_suite/esm4/includes.cpp

@@ -1,4 +1,3 @@
-#include <components/esm4/acti.hpp>
 #include <components/esm4/actor.hpp>
 #include <components/esm4/common.hpp>
 #include <components/esm4/dialogue.hpp>
@@ -8,6 +7,7 @@
 #include <components/esm4/lighting.hpp>
 #include <components/esm4/loadachr.hpp>
 #include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadacti.hpp>
 #include <components/esm4/loadalch.hpp>
 #include <components/esm4/loadaloc.hpp>
 #include <components/esm4/loadammo.hpp>

components/esm/common.hpp

@@ -40,17 +40,6 @@ namespace ESM
         std::uint64_t size;
     };
 
-    enum VarType
-    {
-        VT_Unknown = 0,
-        VT_None,
-        VT_Short, // stored as a float, kinda
-        VT_Int,
-        VT_Long, // stored as a float
-        VT_Float,
-        VT_String
-    };
-
     std::string printName(const std::uint32_t typeId);
 }
 

components/esm4/loadacti.cpp

@@ -24,7 +24,7 @@
   trial & error.  See http://en.uesp.net/wiki for details.
 
 */
-#include "acti.hpp"
+#include "loadacti.hpp"
 
 #include <stdexcept>
 #include <iostream> // FIXME

components/esm4/loadalch.hpp

@@ -75,7 +75,6 @@ namespace ESM4
         Data mData;
         EnchantedItem mItem;
 
-        Potion();
         virtual ~Potion();
 
         virtual void load(ESM4::Reader& reader);

components/esm4/loadpack.hpp

@@ -97,7 +97,6 @@ namespace ESM4
         PTDT mTarget;
         std::vector<CTDA> mConditions;
 
-        AIPackage();
         virtual ~AIPackage();
 
         virtual void load(ESM4::Reader& reader);

components/esm4/reader.hpp

@@ -38,7 +38,8 @@ namespace ESM4 {
     //                                                     v
     typedef std::vector<std::pair<ESM4::GroupTypeHeader, std::uint32_t> > GroupStack;
 
-    struct ReaderContext {
+    struct ReaderContext
+    {
         std::string filename;         // in case we need to reopen to restore the context
         std::uint32_t modIndex;         // the sequential position of this file in the load order:
         //  0x00 reserved, 0xFF in-game (see notes below)