From 785b6c9837cbc7cfd670a8e8dae870d363d2d22a Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 20 Feb 2019 02:04:01 +0100 Subject: [PATCH] Core/Maps: use correct map pointer to get grids in GetWaterOrGroundLevel --- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Maps/Map.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 84ebe2451f..7e7d5e8dd2 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1465,7 +1465,7 @@ bool WorldObject::IsWithinLOS(float ox, float oy, float oz, LineOfSightChecks ch return true; } -bool WorldObject::IsWithinLOSInMap(const WorldObject* obj, LineOfSightChecks checks, VMAP::ModelIgnoreFlags ignoreFlags) const +bool WorldObject::IsWithinLOSInMap(WorldObject const* obj, LineOfSightChecks checks, VMAP::ModelIgnoreFlags ignoreFlags) const { if (!IsInMap(obj)) return false; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7e763d5275..d9083ae79c 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2432,7 +2432,7 @@ bool Map::HasGrid(uint32 mapId, int32 gx, int32 gy) const float Map::GetWaterOrGroundLevel(PhaseShift const& phaseShift, float x, float y, float z, float* ground /*= nullptr*/, bool /*swim = false*/, float collisionHeight /*= DEFAULT_COLLISION_HEIGHT*/) const { - if (const_cast(this)->GetGrid(x, y)) + if (m_parentTerrainMap->GetGrid(x, y)) { // we need ground level (including grid height version) for proper return water level in point float ground_z = GetHeight(phaseShift, x, y, z + collisionHeight, true, 50.0f);