Move esm3terrain to esmterrain

apps/opencs/view/render/terrainstorage.cpp

@@ -1,7 +1,7 @@
 #include "terrainstorage.hpp"
 
 #include <components/esm3/loadltex.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <components/resource/resourcesystem.hpp>
 
 #include <apps/opencs/model/world/data.hpp>

apps/opencs/view/render/terrainstorage.hpp

@@ -5,7 +5,7 @@
 
 #include <components/esm3/loadland.hpp>
 #include <components/esm3/loadltex.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <osg/ref_ptr>
 
 namespace CSMWorld

apps/openmw/mwrender/landmanager.hpp

@@ -4,7 +4,7 @@
 #include <osg/Object>
 
 #include <components/esm/util.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <components/resource/resourcemanager.hpp>
 
 namespace ESM

apps/openmw/mwrender/terrainstorage.hpp

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 

components/CMakeLists.txt

@@ -145,7 +145,7 @@ add_component_dir (esm3
     infoorder timestamp
     )
 
-add_component_dir (esm3terrain
+add_component_dir (esmterrain
     storage
     )
 

components/esmterrain/storage.hpp

@@ -1,5 +1,5 @@
-#ifndef COMPONENTS_ESM_TERRAIN_STORAGE_H
-#define COMPONENTS_ESM_TERRAIN_STORAGE_H
+#ifndef OPENMW_COMPONENTS_ESMTERRAIN_STORAGE_H
+#define OPENMW_COMPONENTS_ESMTERRAIN_STORAGE_H
 
 #include <cassert>
 #include <mutex>