aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapManager.h
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-04-29 22:24:26 +0300
committerShocker <shocker@freakz.ro>2011-04-29 22:24:26 +0300
commit0fb8f057974cdf3107084be65005956efb5191dc (patch)
tree8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/game/Maps/MapManager.h
parentf96e1ce1d7b10074750da761ff9b219a24d0f09f (diff)
parent1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Maps/MapManager.h')
-rwxr-xr-xsrc/server/game/Maps/MapManager.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 610d2626eda..8ca856cbd6f 100755
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -49,15 +49,15 @@ class MapManager
}
uint32 GetAreaId(uint32 mapid, float x, float y, float z) const
{
- return Map::GetAreaIdByAreaFlag(GetAreaFlag(mapid, x, y, z),mapid);
+ return Map::GetAreaIdByAreaFlag(GetAreaFlag(mapid, x, y, z), mapid);
}
uint32 GetZoneId(uint32 mapid, float x, float y, float z) const
{
- return Map::GetZoneIdByAreaFlag(GetAreaFlag(mapid, x, y, z),mapid);
+ return Map::GetZoneIdByAreaFlag(GetAreaFlag(mapid, x, y, z), mapid);
}
void GetZoneAndAreaId(uint32& zoneid, uint32& areaid, uint32 mapid, float x, float y, float z)
{
- Map::GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(mapid, x, y, z),mapid);
+ Map::GetZoneAndAreaIdByAreaFlag(zoneid, areaid, GetAreaFlag(mapid, x, y, z), mapid);
}
void Initialize(void);
@@ -86,19 +86,19 @@ class MapManager
static bool ExistMapAndVMap(uint32 mapid, float x, float y);
static bool IsValidMAP(uint32 mapid, bool startUp);
- static bool IsValidMapCoord(uint32 mapid, float x,float y)
+ static bool IsValidMapCoord(uint32 mapid, float x, float y)
{
- return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y);
+ return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y);
}
- static bool IsValidMapCoord(uint32 mapid, float x,float y,float z)
+ static bool IsValidMapCoord(uint32 mapid, float x, float y, float z)
{
- return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y,z);
+ return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z);
}
- static bool IsValidMapCoord(uint32 mapid, float x,float y,float z,float o)
+ static bool IsValidMapCoord(uint32 mapid, float x, float y, float z, float o)
{
- return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y,z,o);
+ return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z, o);
}
static bool IsValidMapCoord(WorldLocation const& loc)