*Merge.

--HG-- branch : trunk
2009-01-16 22:59:24 -06:00
parent 11239e9f5f 0a1c601a1c
commit fa2e6622ad
12 changed files with 146 additions and 67 deletions
@@ -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;