Core/Vmaps: Rename VMapManager2 to VMapManager

5 files changed, 15 insertions, 15 deletions

diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index b7c05fe1541..b0761cc2d9a 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -38,7 +38,7 @@
 
 namespace VMAP
 {
-    class VMapManager2;
+    class VMapManager;
 }
 
 namespace MMAP
@@ -141,7 +141,7 @@ namespace MMAP
 
     namespace VMapFactory
     {
-        std::unique_ptr<VMAP::VMapManager2> CreateVMapManager(uint32 mapId);
+        std::unique_ptr<VMAP::VMapManager> CreateVMapManager(uint32 mapId);
 }
 }
 
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
index 1e98b19a852..0830c977886 100644
--- a/src/tools/mmaps_generator/PathGenerator.cpp
+++ b/src/tools/mmaps_generator/PathGenerator.cpp
@@ -25,7 +25,7 @@
 #include "PathCommon.h"
 #include "Timer.h"
 #include "Util.h"
-#include "VMapManager2.h"
+#include "VMapManager.h"
 #include <boost/filesystem/operations.hpp>
 #include <unordered_map>
 #include <vector>
@@ -46,9 +46,9 @@ namespace MMAP
 
     namespace VMapFactory
     {
-        std::unique_ptr<VMAP::VMapManager2> CreateVMapManager(uint32 mapId)
+        std::unique_ptr<VMAP::VMapManager> CreateVMapManager(uint32 mapId)
         {
-            std::unique_ptr<VMAP::VMapManager2> vmgr = std::make_unique<VMAP::VMapManager2>();
+            std::unique_ptr<VMAP::VMapManager> vmgr = std::make_unique<VMAP::VMapManager>();
 
             do
             {
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 6894021ea90..ed417ad51e4 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -23,7 +23,7 @@
 #include "ModelInstance.h"
 #include "StringFormat.h"
 #include "Util.h"
-#include "VMapManager2.h"
+#include "VMapManager.h"
 #include <map>
 
 namespace MMAP
@@ -64,7 +64,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager)
+    void TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager)
     {
         if (loadMap(mapID, tileX, tileY, meshData, vmapManager, ENTIRE))
         {
@@ -76,7 +76,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    bool TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager, Spot portion)
+    bool TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager, Spot portion)
     {
         std::string mapFileName = Trinity::StringFormat("maps/{:04}_{:02}_{:02}.map", mapID, tileY, tileX);
 
@@ -579,7 +579,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    bool TerrainBuilder::loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager)
+    bool TerrainBuilder::loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager)
     {
         VMAP::LoadResult result = vmapManager->loadMap("vmaps", mapID, tileX, tileY);
         bool retval = false;
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index fff061d4618..7a7cc6ba918 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -25,7 +25,7 @@
 
 namespace VMAP
 {
-class VMapManager2;
+class VMapManager;
 }
 
 enum class map_liquidHeaderTypeFlags : uint8;
@@ -97,8 +97,8 @@ namespace MMAP
         public:
             explicit TerrainBuilder(bool skipLiquid);
 
-            void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager);
-            bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager);
+            void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager);
+            bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager);
             void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, std::vector<OffMeshData> const& offMeshConnections);
 
             bool usesLiquids() const { return !m_skipLiquid; }
@@ -112,7 +112,7 @@ namespace MMAP
             static void cleanVertices(G3D::Array<float>& verts, G3D::Array<int>& tris);
         private:
             /// Loads a portion of a map's terrain
-            bool loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager2* vmapManager, Spot portion);
+            bool loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, VMAP::VMapManager* vmapManager, Spot portion);
 
             /// Sets loop variables for selecting only certain parts of a map's terrain
             void getLoopVars(Spot portion, int& loopStart, int& loopEnd, int& loopInc);
diff --git a/src/tools/mmaps_generator/TileBuilder.cpp b/src/tools/mmaps_generator/TileBuilder.cpp
index 7b0a7bef00f..bdd25b7ef04 100644
--- a/src/tools/mmaps_generator/TileBuilder.cpp
+++ b/src/tools/mmaps_generator/TileBuilder.cpp
@@ -21,7 +21,7 @@
 #include "MMapDefines.h"
 #include "PathCommon.h"
 #include "StringFormat.h"
-#include "VMapManager2.h"
+#include "VMapManager.h"
 #include <DetourNavMeshBuilder.h>
 
 namespace
@@ -95,7 +95,7 @@ namespace MMAP
 
         MeshData meshData;
 
-        std::unique_ptr<VMAP::VMapManager2> vmapManager = VMapFactory::CreateVMapManager(mapID);
+        std::unique_ptr<VMAP::VMapManager> vmapManager = VMapFactory::CreateVMapManager(mapID);
 
         // get heightmap data
         m_terrainBuilder.loadMap(mapID, tileX, tileY, meshData, vmapManager.get());