diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-02-12 20:39:25 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-02-12 20:40:43 +0100 |
| commit | 52758c1a0b8e37e198d744803460e34600d115b5 (patch) | |
| tree | 962d433175b091670d5b1970dfb058940b6a198e | |
| parent | e45e900bdf1bd2915aaaceec9c25a26de7b8ea9a (diff) | |
Core/Maps: Use map.dbc zone fallback if no area is found in grid files, not only if grid files don't exist
Closes #16583
Closes #16584
Extracting new maps is NOT needed.
(cherry picked from commit fa3f106693733e7db8061fbd44295b0168a94614)
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 1e67e949773..fb7043d9574 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2447,8 +2447,9 @@ 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->AreaTableID; } |