[10231] Use VMAP::VMAPLoadResult instead raw int loadMap result.

mangos · Jul 19, 2010 · c0d225c · c0d225c
1 parent 026b766
commit c0d225c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
@@ -62,7 +62,7 @@ Map::~Map()
 void Map::LoadVMap(int gx,int gy)
 {
                                                             // x and y are swapped !!
-    int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld.GetDataPath()+ "vmaps").c_str(),  GetId(), gx,gy);
+    VMAP::VMAPLoadResult vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld.GetDataPath()+ "vmaps").c_str(),  GetId(), gx,gy);
     switch(vmapLoadResult)
     {
         case VMAP::VMAP_LOAD_RESULT_OK:

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10230"
+ #define REVISION_NR "10231"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h
@@ -53,7 +53,7 @@ namespace VMAP
 
             virtual ~IVMapManager(void) {}
 
-            virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
+            virtual VMAPLoadResult loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
 
             virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
 

diff --git a/src/shared/vmap/VMapManager2.cpp b/src/shared/vmap/VMapManager2.cpp
@@ -120,9 +120,9 @@ namespace VMAP
 
     //=========================================================
 
-    int VMapManager2::loadMap(const char* pBasePath, unsigned int pMapId, int x, int y)
+    VMAPLoadResult VMapManager2::loadMap(const char* pBasePath, unsigned int pMapId, int x, int y)
     {
-        int result = VMAP_LOAD_RESULT_IGNORED;
+        VMAPLoadResult result = VMAP_LOAD_RESULT_IGNORED;
         if (isMapLoadingEnabled() && !iIgnoreMapIds.count(pMapId))
         {
             if (_loadMap(pMapId, pBasePath, x, y))

diff --git a/src/shared/vmap/VMapManager2.h b/src/shared/vmap/VMapManager2.h
@@ -82,7 +82,7 @@ namespace VMAP
             VMapManager2();
             ~VMapManager2(void);
 
-            int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y);
+            VMAPLoadResult loadMap(const char* pBasePath, unsigned int pMapId, int x, int y);
 
             void unloadMap(unsigned int pMapId, int x, int y);
             void unloadMap(unsigned int pMapId);