Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: Fix static analysis issues

Browse Source
This commit is contained in:
Aokromes committed 2017-12-08 15:23:32 +01:00
1 parent 4ee51ff96e
commit 2e0f2ee3fb
3 files changed
+7 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Maps/Map.cpp
+5 -1
View File
@@ -2528,8 +2528,10 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
if (vmapData.areaInfo)
data.areaInfo = boost::in_place(vmapData.areaInfo->adtId, vmapData.areaInfo->rootId, vmapData.areaInfo->groupId, vmapData.areaInfo->mogpFlags);
float mapHeight = VMAP_INVALID_HEIGHT;
GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y);
float mapHeight = gmap->getHeight(x, y);
if (gmap)
mapHeight = gmap->getHeight(x, y);
// area lookup
AreaTableEntry const* areaEntry = nullptr;
@@ -2537,6 +2539,8 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
if (WMOAreaTableEntry const* wmoEntry = GetWMOAreaTableEntryByTripple(vmapData.areaInfo->rootId, vmapData.areaInfo->adtId, vmapData.areaInfo->groupId))
areaEntry = sAreaTableStore.LookupEntry(wmoEntry->areaId);
data.areaId = 0;
if (areaEntry)
{
data.floorZ = vmapData.floorZ;