move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4

esm typo esm typo
2025-05-05 00:08:00 +03:00 · 2022-01-22 15:58:41 +01:00 · 2022-01-22 15:58:41 +01:00 · d1fb854521
commit d1fb854521
parent c263bbf0f6
448 changed files with 686 additions and 683 deletions
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@ -10,7 +10,7 @@
 #include <QProcess>
 #include <QTextDocument>

-#include <components/esm/debugprofile.hpp>
+#include <components/esm3/debugprofile.hpp>

 class QTemporaryFile;

--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@ -4,7 +4,7 @@

 #include <QUndoStack>

-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>

 #include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@ -8,7 +8,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>

-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmwriter.hpp>

 #include <components/to_utf8/to_utf8.hpp>

--- a/apps/opencs/model/tools/birthsigncheck.hpp
+++ b/apps/opencs/model/tools/birthsigncheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_BIRTHSIGNCHECK_H
 #define CSM_TOOLS_BIRTHSIGNCHECK_H

-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>

 #include "../world/idcollection.hpp"
 #include "../world/resources.hpp"
--- a/apps/opencs/model/tools/bodypartcheck.hpp
+++ b/apps/opencs/model/tools/bodypartcheck.hpp
@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_BODYPARTCHECK_H
 #define CSM_TOOLS_BODYPARTCHECK_H

-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>

 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@ -2,8 +2,8 @@

 #include <map>

-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>

 #include "../prefs/state.hpp"

--- a/apps/opencs/model/tools/classcheck.hpp
+++ b/apps/opencs/model/tools/classcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_CLASSCHECK_H
 #define CSM_TOOLS_CLASSCHECK_H

-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/enchantmentcheck.hpp
+++ b/apps/opencs/model/tools/enchantmentcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_ENCHANTMENTCHECK_H
 #define CSM_TOOLS_ENCHANTMENTCHECK_H

-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@ -2,7 +2,7 @@

 #include <map>

-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>

 #include "../prefs/state.hpp"

--- a/apps/opencs/model/tools/factioncheck.hpp
+++ b/apps/opencs/model/tools/factioncheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_FACTIONCHECK_H
 #define CSM_TOOLS_FACTIONCHECK_H

-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadfact.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/gmstcheck.hpp
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_GMSTCHECK_H
 #define CSM_TOOLS_GMSTCHECK_H

-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/journalcheck.hpp
+++ b/apps/opencs/model/tools/journalcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_JOURNALCHECK_H
 #define CSM_TOOLS_JOURNALCHECK_H

-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>

 #include "../world/idcollection.hpp"
 #include "../world/infocollection.hpp"
--- a/apps/opencs/model/tools/magiceffectcheck.hpp
+++ b/apps/opencs/model/tools/magiceffectcheck.hpp
@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
 #define CSM_TOOLS_MAGICEFFECTCHECK_HPP

-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>

 #include "../world/idcollection.hpp"
 #include "../world/refidcollection.hpp"
--- a/apps/opencs/model/tools/racecheck.hpp
+++ b/apps/opencs/model/tools/racecheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_RACECHECK_H
 #define CSM_TOOLS_RACECHECK_H

-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/regioncheck.hpp
+++ b/apps/opencs/model/tools/regioncheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_REGIONCHECK_H
 #define CSM_TOOLS_REGIONCHECK_H

-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadregn.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/skillcheck.hpp
+++ b/apps/opencs/model/tools/skillcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SKILLCHECK_H
 #define CSM_TOOLS_SKILLCHECK_H

-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SOUNDCHECK_H
 #define CSM_TOOLS_SOUNDCHECK_H

-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadsoun.hpp>

 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@ -3,7 +3,7 @@
 #include <sstream>
 #include <map>

-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>

 #include "../prefs/state.hpp"

--- a/apps/opencs/model/tools/spellcheck.hpp
+++ b/apps/opencs/model/tools/spellcheck.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SPELLCHECK_H
 #define CSM_TOOLS_SPELLCHECK_H

-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>

 #include "../world/idcollection.hpp"

--- a/apps/opencs/model/tools/startscriptcheck.hpp
+++ b/apps/opencs/model/tools/startscriptcheck.hpp
@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
 #define CSM_TOOLS_STARTSCRIPTCHECK_H

-#include <components/esm/loadsscr.hpp>
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/loadscpt.hpp>

 #include "../doc/stage.hpp"

--- a/apps/opencs/model/tools/topicinfocheck.hpp
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@ -3,13 +3,13 @@

 #include <set>

-#include <components/esm/loadclas.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadregn.hpp>

 #include "../world/cell.hpp"
 #include "../world/idcollection.hpp"
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@ -1,10 +1,10 @@
 #include "actoradapter.hpp"

-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/mappings.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/sceneutil/actorutil.hpp>

 #include "data.hpp"
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@ -10,8 +10,8 @@
 #include <QObject>
 #include <QModelIndex>

-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/misc/weakcache.hpp>

 #include "refidcollection.hpp"
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@ -4,7 +4,7 @@
 #include <vector>
 #include <string>

-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@ -5,7 +5,7 @@
 #include <ostream>
 #include <sstream>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>

 CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@ -9,9 +9,9 @@
 #include <QColor>
 #include <QVector>

-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadrace.hpp>

 #include "columnbase.hpp"
 #include "columns.hpp"
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@ -405,7 +405,7 @@ namespace
        "Combat", "Magic", "Stealth", 0
    };

-    // see ESM::Attribute::AttributeID in <component/esm/attr.hpp>
+    // see ESM::Attribute::AttributeID in <component/esm3/attr.hpp>
    static const char *sAttributes[] =
    {
        "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality",
@ -498,7 +498,7 @@ namespace
        "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0
    };

-    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm/loadskil.hpp>
+    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm3/loadskil.hpp>
    static const char *sSkills[] =
    {
        "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon",
@ -509,13 +509,13 @@ namespace
        "Speechcraft", "HandToHand", 0
    };

-    // range of magic effects, see ESM::RangeType in <component/esm/defs.hpp>
+    // range of magic effects, see ESM::RangeType in <component/esm3/defs.hpp>
    static const char *sEffectRange[] =
    {
        "Self", "Touch", "Target", 0
    };

-    // magic effect names, see ESM::MagicEffect::Effects in <component/esm/loadmgef.hpp>
+    // magic effect names, see ESM::MagicEffect::Effects in <component/esm3/loadmgef.hpp>
    static const char *sEffectId[] =
    {
        "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
@ -549,7 +549,7 @@ namespace
        "SummonBonewolf", "SummonCreature04", "SummonCreature05", 0
    };

-    // see ESM::PartReferenceType in <component/esm/loadarmo.hpp>
+    // see ESM::PartReferenceType in <component/esm3/loadarmo.hpp>
    static const char *sPartRefType[] =
    {
        "Head", "Hair", "Neck", "Cuirass", "Groin",
@ -560,7 +560,7 @@ namespace
        "Weapon", "Tail", 0
    };

-    // see the enums in <component/esm/aipackage.hpp>
+    // see the enums in <component/esm3/aipackage.hpp>
    static const char *sAiPackageType[] =
    {
        "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@ -5,10 +5,10 @@

 #include <QAbstractItemModel>

-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellref.hpp>

 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@ -9,25 +9,25 @@
 #include <QObject>
 #include <QModelIndex>

-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadsoun.hpp>
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadbsgn.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadsndg.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/debugprofile.hpp>
-#include <components/esm/filter.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/debugprofile.hpp>
+#include <components/esm3/filter.hpp>

 #include <components/resource/resourcesystem.hpp>

--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_IDCOLLECTION_H
 #define CSM_WOLRD_IDCOLLECTION_H

-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>

 #include "collection.hpp"
 #include "land.hpp"
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@ -7,7 +7,7 @@
 #include <map>
 #include <stdexcept>

-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 #include <components/misc/stringops.hpp>

 #include "collectionbase.hpp"
--- a/apps/opencs/model/world/info.hpp
+++ b/apps/opencs/model/world/info.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_INFO_H
 #define CSM_WOLRD_INFO_H

-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@ -4,8 +4,8 @@
 #include <iterator>
 #include <cassert>

-#include <components/esm/esmreader.hpp>
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loaddial.hpp>

 #include <components/misc/stringops.hpp>

--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_WORLD_INFOSELECTWRAPPER_H
 #define CSM_WORLD_INFOSELECTWRAPPER_H

-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/land.hpp
+++ b/apps/opencs/model/world/land.hpp
@ -3,7 +3,7 @@

 #include <string>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/landtexture.cpp
+++ b/apps/opencs/model/world/landtexture.cpp
@ -3,7 +3,7 @@
 #include <sstream>
 #include <stdexcept>

-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/landtexture.hpp
+++ b/apps/opencs/model/world/landtexture.hpp
@ -3,7 +3,7 @@

 #include <string>

-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadltex.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@ -1,8 +1,8 @@
 #include "metadata.hpp"

-#include <components/esm/loadtes3.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadtes3.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>

 void CSMWorld::MetaData::blank()
 {
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@ -1,7 +1,7 @@
 #include "nestedcoladapterimp.hpp"

-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadfact.hpp>

 #include "idcollection.hpp"
 #include "pathgrid.hpp"
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@ -3,12 +3,12 @@

 #include <QVariant>

-#include <components/esm/loadpgrd.hpp>
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp> // for converting magic effect id to string & back
-#include <components/esm/loadskil.hpp> // for converting skill names
+#include <components/esm3/loadpgrd.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadmgef.hpp> // for converting magic effect id to string & back
+#include <components/esm3/loadskil.hpp> // for converting skill names
 #include <components/esm/attr.hpp>     // for converting attributes
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>

 #include "nestedcolumnadapter.hpp"
 #include "nestedtablewrapper.hpp"
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@ -4,7 +4,7 @@
 #include <vector>
 #include <string>

-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@ -3,7 +3,7 @@

 #include <utility>

-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@ -1,6 +1,6 @@
 #include "refcollection.hpp"

-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>

 #include "ref.hpp"
 #include "cell.hpp"
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>

-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadmgef.hpp>

 #include "nestedtablewrapper.hpp"

--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@ -5,11 +5,11 @@

 #include <QVariant>

-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>

 #include "columnbase.hpp"
 #include "record.hpp"
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@ -4,7 +4,7 @@
 #include <memory>
 #include <string_view>

-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>

 #include "refidadapter.hpp"
 #include "refidadapterimp.hpp"
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@ -7,26 +7,26 @@
 #include <cassert>
 #include <string_view>

-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/esmwriter.hpp>

 #include <components/misc/stringops.hpp>

--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@ -3,7 +3,7 @@
 #include <osg/Group>
 #include <osg/Node>

-#include <components/esm/mappings.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/resource/scenemanager.hpp>
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@ -8,7 +8,7 @@

 #include <QObject>

-#include <components/esm/loadarmo.hpp>
+#include <components/esm3/loadarmo.hpp>
 #include <components/sceneutil/visitor.hpp>

 #include "../../model/world/actoradapter.hpp"
--- a/apps/opencs/view/render/brushdraw.hpp
+++ b/apps/opencs/view/render/brushdraw.hpp
@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/Geometry>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../widget/brushshapes.hpp"

 namespace CSVRender
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@ -8,8 +8,8 @@
 #include <osg/Group>

 #include <components/misc/stringops.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>

--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@ -5,7 +5,7 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>

 #include "mask.hpp"

--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@ -5,7 +5,7 @@
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/imagemanager.hpp>
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@ -3,7 +3,7 @@
 #include <QPointer>

 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>

 #include "editmode.hpp"
 #include "terrainselection.hpp"
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@ -6,7 +6,7 @@
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>

 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@ -8,7 +8,7 @@
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../../model/world/cellcoordinates.hpp"

 namespace osg
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@ -15,7 +15,7 @@
 #include <osg/Group>
 #include <osg/Vec3f>

-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>

 #include "../widget/brushshapes.hpp"
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@ -1,6 +1,6 @@
 #include "dialoguecreator.hpp"

-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>

 #include "../../model/doc/document.hpp"

--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@ -1,6 +1,6 @@
 #include "globalcreator.hpp"

-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>

 #include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
--- a/apps/opencs/view/world/vartypedelegate.hpp
+++ b/apps/opencs/view/world/vartypedelegate.hpp
@ -1,7 +1,7 @@
 #ifndef CSV_WORLD_VARTYPEDELEGATE_H
 #define CSV_WORLD_VARTYPEDELEGATE_H

-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>

 #include "enumdelegate.hpp"