aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Management
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/Collision/Management')
-rw-r--r--src/common/Collision/Management/IVMapManager.h6
-rw-r--r--src/common/Collision/Management/VMapManager2.cpp4
-rw-r--r--src/common/Collision/Management/VMapManager2.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index 87c084f7f8c..3d760082e28 100644
--- a/src/common/Collision/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
@@ -18,10 +18,10 @@
#ifndef _IVMAPMANAGER_H
#define _IVMAPMANAGER_H
-#include <string>
#include "Define.h"
#include "ModelIgnoreFlags.h"
#include "Optional.h"
+#include <string>
//===========================================================
@@ -82,9 +82,9 @@ namespace VMAP
virtual ~IVMapManager(void) { }
- virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
+ virtual int loadMap(char const* pBasePath, unsigned int pMapId, int x, int y) = 0;
- virtual LoadResult existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
+ virtual LoadResult existsMap(char const* pBasePath, unsigned int pMapId, int x, int y) = 0;
virtual void unloadMap(unsigned int pMapId, int x, int y) = 0;
virtual void unloadMap(unsigned int pMapId) = 0;
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 428ae6ba146..88494d0a0c7 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -99,7 +99,7 @@ namespace VMAP
return fname.str();
}
- int VMapManager2::loadMap(const char* basePath, unsigned int mapId, int x, int y)
+ int VMapManager2::loadMap(char const* basePath, unsigned int mapId, int x, int y)
{
int result = VMAP_LOAD_RESULT_IGNORED;
if (isMapLoadingEnabled())
@@ -387,7 +387,7 @@ namespace VMAP
}
}
- LoadResult VMapManager2::existsMap(const char* basePath, unsigned int mapId, int x, int y)
+ LoadResult VMapManager2::existsMap(char const* basePath, unsigned int mapId, int x, int y)
{
return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y, this);
}
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index f16038264dc..76253faded4 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -101,7 +101,7 @@ namespace VMAP
void InitializeThreadUnsafe(std::unordered_map<uint32, std::vector<uint32>> const& mapData);
- int loadMap(const char* pBasePath, unsigned int mapId, int x, int y) override;
+ int loadMap(char const* pBasePath, unsigned int mapId, int x, int y) override;
bool loadSingleMap(uint32 mapId, const std::string& basePath, uint32 tileX, uint32 tileY);
void unloadMap(unsigned int mapId, int x, int y) override;
@@ -131,7 +131,7 @@ namespace VMAP
{
return getMapFileName(mapId);
}
- virtual LoadResult existsMap(const char* basePath, unsigned int mapId, int x, int y) override;
+ virtual LoadResult existsMap(char const* basePath, unsigned int mapId, int x, int y) override;
void getInstanceMapTree(InstanceTreeMap &instanceMapTree);