*Merge.

--HG--
branch : trunk

1 files changed, 1 insertions, 0 deletions

diff --git a/src/game/Map.h b/src/game/Map.h
index 7e885ebf61f..bae8889d3ee 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -183,6 +183,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
         // some calls like isInWater should not use vmaps due to processor power
         // can return INVALID_HEIGHT if under z+2 z coord not found height
         float GetHeight(float x, float y, float z, bool pCheckVMap=true) const;
+        float GetVmapHeight(float x, float y, float z, bool useMaps) const;
         bool IsInWater(float x, float y, float z) const;    // does not use z pos. This is for future use
 
         uint16 GetAreaFlag(float x, float y, float z) const;