diff options
| author | megamage <none@none> | 2009-02-18 11:36:19 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-18 11:36:19 -0600 |
| commit | 31637d4aac6ae2081ccb3db976cab17936019f1a (patch) | |
| tree | a0e098d4afafaddcb901486d00da1563ecd628b9 /src/game/MapManager.cpp | |
| parent | 017f309b5b5b981b6edfe0ae071971d513828a20 (diff) | |
| parent | 7bff1c1d60b78ba78f2ab0a9c67bdde80427ea30 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/MapManager.cpp')
| -rw-r--r-- | src/game/MapManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index d159b1a6265..fd1f7963593 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -291,12 +291,12 @@ bool MapManager::IsValidMAP(uint32 mapid) // TODO: add check for battleground template } -void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) +/*void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) { CellPair p = Trinity::ComputeCellPair(x,y); Cell cell(p); GetMap(mapid, obj)->LoadGrid(cell,no_unload); -} +}*/ void MapManager::UnloadAll() { @@ -350,3 +350,4 @@ uint32 MapManager::GetNumPlayersInInstances() } return ret; } + |