mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
VladimirMangos 2010-07-20 01:22:50 +04:00
parent 06bcc77495
commit 0065693c4c
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Map.cpp
View file

@ -62,7 +62,7 @@ Map::~Map()
void Map::LoadVMap(int gx,int gy) void Map::LoadVMap(int gx,int gy)
{ {
// x and y are swapped !! // 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) switch(vmapLoadResult)
{ {
case VMAP::VMAP_LOAD_RESULT_OK: case VMAP::VMAP_LOAD_RESULT_OK:

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10230" #define REVISION_NR "10231"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

2
src/shared/vmap/IVMapManager.h
View file

@ -53,7 +53,7 @@ namespace VMAP
virtual ~IVMapManager(void) {} 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; virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;

4
src/shared/vmap/VMapManager2.cpp
View file

@ -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 (isMapLoadingEnabled() && !iIgnoreMapIds.count(pMapId))
{ {
if (_loadMap(pMapId, pBasePath, x, y)) if (_loadMap(pMapId, pBasePath, x, y))

2
src/shared/vmap/VMapManager2.h
View file

@ -82,7 +82,7 @@ namespace VMAP
VMapManager2(); VMapManager2();
~VMapManager2(void); ~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, int x, int y);
void unloadMap(unsigned int pMapId); void unloadMap(unsigned int pMapId);