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

components/CMakeLists.txt

@@ -76,15 +76,18 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir (esm
-    attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
+add_component_dir(esm attr defs esmcommon records util luascripts)
+
+add_component_dir (esm3
+    esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loaddial loaddoor loadench loadfact loadglob loadgmst
     loadinfo loadingr loadland loadlevlist loadligh loadlock loadprob loadrepa loadltex loadmgef loadmisc
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat
-    loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
-    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap inventorystate containerstate npcstate creaturestate dialoguestate statstate
-    npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate mappings luascripts
+    loadweap aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
+    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap
+    inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats
+    weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
+    aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
     )
 
 add_component_dir (esmterrain

components/config/gamesettings.cpp

@@ -465,7 +465,7 @@ bool Config::GameSettings::hasMaster()
     QStringList content = mSettings.values(QString(Config::GameSettings::sContentKey));
     for (int i = 0; i < content.count(); ++i) 
     {
-        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)) 
+        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
         {
             result = true;
             break;

components/contentselector/model/contentmodel.cpp

@@ -8,7 +8,7 @@
 #include <QTextCodec>
 #include <QDebug>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts) :
     QAbstractTableModel(parent),

components/contentselector/model/esmfile.cpp

@@ -66,7 +66,7 @@ QByteArray ContentSelectorModel::EsmFile::encodedData() const
 bool ContentSelectorModel::EsmFile::isGameFile() const
 { 
     return (mGameFiles.size() == 0) &&
-        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) || 
+        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) ||
         mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
 }
 

components/detournavigator/navigatorimpl.cpp

@@ -3,7 +3,7 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
 namespace DetourNavigator

components/esm/luascripts.cpp

@@ -1,7 +1,7 @@
 #include "luascripts.hpp"
 
-#include "esmreader.hpp"
-#include "esmwriter.hpp"
+#include "components/esm3/esmreader.hpp"
+#include "components/esm3/esmwriter.hpp"
 
 // List of all records, that are related to Lua.
 //

components/esm/records.hpp

@@ -2,48 +2,48 @@
 #define OPENMW_ESM_RECORDS_H
 
 #include "defs.hpp"
-#include "loadacti.hpp"
-#include "loadalch.hpp"
-#include "loadappa.hpp"
-#include "loadarmo.hpp"
-#include "loadbody.hpp"
-#include "loadbook.hpp"
-#include "loadbsgn.hpp"
-#include "loadcell.hpp"
-#include "loadclas.hpp"
-#include "loadclot.hpp"
-#include "loadcont.hpp"
-#include "loadcrea.hpp"
-#include "loadinfo.hpp"
-#include "loaddial.hpp"
-#include "loaddoor.hpp"
-#include "loadench.hpp"
-#include "loadfact.hpp"
-#include "loadglob.hpp"
-#include "loadgmst.hpp"
-#include "loadingr.hpp"
-#include "loadland.hpp"
-#include "loadlevlist.hpp"
-#include "loadligh.hpp"
-#include "loadlock.hpp"
-#include "loadrepa.hpp"
-#include "loadprob.hpp"
-#include "loadltex.hpp"
-#include "loadmgef.hpp"
-#include "loadmisc.hpp"
-#include "loadnpc.hpp"
-#include "loadpgrd.hpp"
-#include "loadrace.hpp"
-#include "loadregn.hpp"
-#include "loadscpt.hpp"
-#include "loadskil.hpp"
-#include "loadsndg.hpp"
-#include "loadsoun.hpp"
-#include "loadspel.hpp"
-#include "loadsscr.hpp"
-#include "loadstat.hpp"
-#include "loadweap.hpp"
+#include "components/esm3/loadacti.hpp"
+#include "components/esm3/loadalch.hpp"
+#include "components/esm3/loadappa.hpp"
+#include "components/esm3/loadarmo.hpp"
+#include "components/esm3/loadbody.hpp"
+#include "components/esm3/loadbook.hpp"
+#include "components/esm3/loadbsgn.hpp"
+#include "components/esm3/loadcell.hpp"
+#include "components/esm3/loadclas.hpp"
+#include "components/esm3/loadclot.hpp"
+#include "components/esm3/loadcont.hpp"
+#include "components/esm3/loadcrea.hpp"
+#include "components/esm3/loadinfo.hpp"
+#include "components/esm3/loaddial.hpp"
+#include "components/esm3/loaddoor.hpp"
+#include "components/esm3/loadench.hpp"
+#include "components/esm3/loadfact.hpp"
+#include "components/esm3/loadglob.hpp"
+#include "components/esm3/loadgmst.hpp"
+#include "components/esm3/loadingr.hpp"
+#include "components/esm3/loadland.hpp"
+#include "components/esm3/loadlevlist.hpp"
+#include "components/esm3/loadligh.hpp"
+#include "components/esm3/loadlock.hpp"
+#include "components/esm3/loadrepa.hpp"
+#include "components/esm3/loadprob.hpp"
+#include "components/esm3/loadltex.hpp"
+#include "components/esm3/loadmgef.hpp"
+#include "components/esm3/loadmisc.hpp"
+#include "components/esm3/loadnpc.hpp"
+#include "components/esm3/loadpgrd.hpp"
+#include "components/esm3/loadrace.hpp"
+#include "components/esm3/loadregn.hpp"
+#include "components/esm3/loadscpt.hpp"
+#include "components/esm3/loadskil.hpp"
+#include "components/esm3/loadsndg.hpp"
+#include "components/esm3/loadsoun.hpp"
+#include "components/esm3/loadspel.hpp"
+#include "components/esm3/loadsscr.hpp"
+#include "components/esm3/loadstat.hpp"
+#include "components/esm3/loadweap.hpp"
 
 // Special records which are not loaded from ESM
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #endif

components/esm3/activespells.hpp

@@ -2,7 +2,7 @@
 #define OPENMW_ESM_ACTIVESPELLS_H
 
 #include "cellref.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "effectlist.hpp"
 
 #include <string>

components/esm3/aipackage.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {

components/esm3/aisequence.hpp

@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "util.hpp"
+#include "components/esm/util.hpp"
 
 namespace ESM
 {

components/esm3/cellref.hpp

@@ -4,7 +4,7 @@
 #include <limits>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/cellstate.hpp

@@ -3,7 +3,7 @@
 
 #include "cellid.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/creaturestats.hpp

@@ -7,9 +7,9 @@
 
 #include "statstate.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #include "spellstate.hpp"
 #include "activespells.hpp"
 #include "magiceffects.hpp"

components/esm3/debugprofile.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::DebugProfile::sRecordId = REC_DBGP;
 

components/esm3/esmreader.hpp

@@ -12,7 +12,7 @@
 
 #include <components/to_utf8/to_utf8.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ESM {

components/esm3/esmwriter.hpp

@@ -4,7 +4,7 @@
 #include <iosfwd>
 #include <list>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ToUTF8

components/esm3/filter.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::Filter::sRecordId = REC_FILT;
 

components/esm3/globalmap.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::GlobalMap::sRecordId = ESM::REC_GMAP;
 

components/esm3/loadacti.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadalch.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadappa.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadarmo.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadbody.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadbook.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadbsgn.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadcell.cpp

@@ -11,7 +11,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "cellid.hpp"
 
 namespace

components/esm3/loadcell.hpp

@@ -5,8 +5,8 @@
 #include <vector>
 #include <list>
 
-#include "esmcommon.hpp"
-#include "defs.hpp"
+#include "components/esm/esmcommon.hpp"
+#include "components/esm/defs.hpp"
 #include "cellref.hpp"
 #include "cellid.hpp"
 

components/esm3/loadclas.cpp

@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadclot.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadcont.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadcont.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {

components/esm3/loadcrea.cpp

@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM {
 

components/esm3/loaddial.cpp

@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loaddoor.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadench.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadfact.cpp

@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadglob.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadgmst.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadinfo.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadinfo.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "variant.hpp"
 
 namespace ESM

components/esm3/loadingr.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadland.cpp

@@ -5,7 +5,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadland.hpp

@@ -5,7 +5,7 @@
 
 #include <components/misc/constants.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {

components/esm3/loadlevlist.cpp

@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {