diff options
author | megamage <none@none> | 2009-01-02 11:03:43 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-01-02 11:03:43 -0600 |
commit | 1e4381f7b1ad0127257dc858ce300ded444e2664 (patch) | |
tree | 3e969945e05665916eded128ca5338efab9b812a /src/game/MapManager.h | |
parent | 3deefb9f00201033728d4467180d8ba9aa265a20 (diff) |
*Update to Mangos 7006.
--HG--
branch : trunk
Diffstat (limited to 'src/game/MapManager.h')
-rw-r--r-- | src/game/MapManager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/MapManager.h b/src/game/MapManager.h index cba0a86d1a5..e7ff17b0aa1 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -47,13 +47,13 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit Map const* GetBaseMap(uint32 id) const { return const_cast<MapManager*>(this)->_GetBaseMap(id); } void DeleteInstance(uint32 mapid, uint32 instanceId); - inline uint16 GetAreaFlag(uint32 mapid, float x, float y) const + inline uint16 GetAreaFlag(uint32 mapid, float x, float y, float z) const { Map const* m = GetBaseMap(mapid); - return m->GetAreaFlag(x, y); + return m->GetAreaFlag(x, y, z); } - inline uint32 GetAreaId(uint32 mapid, float x, float y) { return Map::GetAreaId(GetAreaFlag(mapid, x, y),mapid); } - inline uint32 GetZoneId(uint32 mapid, float x, float y) { return Map::GetZoneId(GetAreaFlag(mapid, x, y),mapid); } + inline uint32 GetAreaId(uint32 mapid, float x, float y, float z) { return Map::GetAreaId(GetAreaFlag(mapid, x, y, z),mapid); } + inline uint32 GetZoneId(uint32 mapid, float x, float y, float z) { return Map::GetZoneId(GetAreaFlag(mapid, x, y, z),mapid); } void Initialize(void); void Update(time_t); |