diff options
| author | sucofog <4pdcvicente@gmail.com> | 2017-11-15 18:55:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 18:55:04 +0100 |
| commit | c75ec13191ee5e6525d8fcf963cc7adcaf979739 (patch) | |
| tree | 384cd42718a62cb6d4f5c8bee1b843b533449424 /src/game/Maps/Map.cpp | |
| parent | 17802ab6e5135f0220efcd8f4e460f8202a4c047 (diff) | |
Core-side part for recastnav upgrade:
Corrected values, fixed compile, re-extraction of Mmaps it's required again, mmaps will be updated on wiki.
Diffstat (limited to 'src/game/Maps/Map.cpp')
| -rw-r--r-- | src/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp index a18ebf84ef..4e6a595a55 100644 --- a/src/game/Maps/Map.cpp +++ b/src/game/Maps/Map.cpp @@ -2012,7 +2012,7 @@ uint32 Map::GetAreaId(float x, float y, float z, bool *isOutdoors) const atEntry = sAreaTableStore.LookupEntry(wmoEntry->areaId); } - uint16 areaId; + uint16 areaId = 0; if (atEntry) areaId = atEntry->ID; @@ -2021,7 +2021,7 @@ uint32 Map::GetAreaId(float x, float y, float z, bool *isOutdoors) const if (GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) areaId = gmap->getArea(x, y); // this used while not all *.map files generated (instances) - else + if (!areaId) areaId = i_mapEntry->linked_zone; } |