diff options
| author | Chaz Brown <iamparadox@netscape.net> | 2009-09-15 20:55:14 -0400 |
|---|---|---|
| committer | Chaz Brown <iamparadox@netscape.net> | 2009-09-15 20:55:14 -0400 |
| commit | 1870644bf75f21567eaf07e1f8bc0eb07734fa36 (patch) | |
| tree | f8040cb391d185ede9fc67fb02210b76de88c91a /src | |
| parent | 0174dd5aff75b688a566d63af5cd3a4032764965 (diff) | |
[8500] Fixed long existed bug with vmaps unloading.
When order of coordinates has been updated for loading case, unloading part
escape fixing in past.
Patch By Jolan
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 4c6dbba2e90..390efda1002 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1081,7 +1081,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll) delete GridMaps[gx][gy]; } // x and y are swapped - VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gy, gx); + VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gx, gy); } else ((MapInstanced*)m_parentMap)->RemoveGridMapReference(GridPair(gx, gy)); @@ -1760,7 +1760,7 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const // The Violet Hold (Dalaran), fast check if (x < 5791.0f && y > 404.0f && y < 595.0f) - { + { areaflag = 2540; break; } @@ -1788,14 +1788,14 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const // The Eventide (Dalaran), fast check against diagonal box with lower limit if (z > 635.0f && x+y < 6375.0f && x+y > 6295.0f && x-y < 5106.0f && x-y > 4972.0f) - { + { areaflag = 2543; break; } // The Violet Hold (Dalaran), fast check if (x < 5791.0f && y > 404.0f && y < 595.0f) - { + { areaflag = 2540; break; } |