aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Management/VMapManager2.cpp
diff options
context:
space:
mode:
authorrunningnak3d <none@none>2010-10-08 20:14:12 -0600
committerrunningnak3d <none@none>2010-10-08 20:14:12 -0600
commit3feda9b6af99e2d8161bf8ff5a55554d290342a5 (patch)
tree048c77faf18e6e3902df5df67d7a563742f0743a /src/server/collision/Management/VMapManager2.cpp
parenta6170675c60c53d3cbc2d17d3dbd74d3e813d5b9 (diff)
Core/Vmaps: Remove the ability to ignore individual maps from vmap LOS /
height checking. Also add a warning if vmap.enableHeight is disabled. You *MUST* have all LOS / height checking enabled to have a functional server. Original patch by: Vladimir --HG-- branch : trunk
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
-rw-r--r--src/server/collision/Management/VMapManager2.cpp33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 4f009fabeb1..c2cebaa1292 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -89,42 +89,11 @@ namespace VMAP
}
//=========================================================
- /**
- Block maps from being used.
- parameter: String of map ids. Delimiter = ","
- e.g.: "0,1,590"
- */
-
- void VMapManager2::preventMapsFromBeingUsed(const char* pMapIdString)
- {
- iIgnoreMapIds.clear();
- if (pMapIdString != NULL)
- {
- std::string map_str;
- std::stringstream map_ss;
- map_ss.str(std::string(pMapIdString));
- while (std::getline(map_ss, map_str, ','))
- {
- std::stringstream ss2(map_str);
- int map_num = -1;
- ss2 >> map_num;
- if (map_num >= 0)
- {
- sLog.outDebug("Ignoring Map %i for VMaps", map_num);
- iIgnoreMapIds[map_num] = true;
- // unload map in case it is loaded
- unloadMap(map_num);
- }
- }
- }
- }
-
- //=========================================================
int VMapManager2::loadMap(const char* pBasePath, unsigned int pMapId, int x, int y)
{
int result = VMAP_LOAD_RESULT_IGNORED;
- if (isMapLoadingEnabled() && !iIgnoreMapIds.count(pMapId))
+ if (isMapLoadingEnabled())
{
if (_loadMap(pMapId, pBasePath, x, y))
result = VMAP_LOAD_RESULT_OK;