REPO: Code-style clean-ups
* Fixed pMap->map * Fixed pInstance->instance * Fixed pInsta->instance * Fixed pQuest->quest * Fixed pWho->who * Fixed pTarget->target * Fixed pGo->go ~DEVNOTES: Handlers/QuestHandler.cpp still needs to be cleaned...
This commit is contained in:
1 parent
c89b1f6989
commit
5b4c7783c2
324 files changed
+4886
-4849
No files matched your search
@@ -31,7 +31,6 @@
|
||||
#include "ObjectMgr.h"
|
||||
#include "Group.h"
|
||||
|
||||
|
||||
union u_map_magic
|
||||
{
|
||||
char asChar[4];
|
||||
@@ -144,7 +143,7 @@ void Map::LoadMap(int gx, int gy, bool reload)
|
||||
if (!m_parentMap->GridMaps[gx][gy])
|
||||
m_parentMap->EnsureGridCreated(GridPair(63-gx, 63-gy));
|
||||
|
||||
((MapInstanced*)(m_parentMap))->AddGridMapReference(GridPair(gx, gy));
|
||||
((Mainstanced*)(m_parentMap))->AddGridMapReference(GridPair(gx, gy));
|
||||
GridMaps[gx][gy] = m_parentMap->GridMaps[gx][gy];
|
||||
return;
|
||||
}
|
||||
@@ -993,7 +992,7 @@ bool Map::UnloadGrid(const uint32 x, const uint32 y, bool unloadAll)
|
||||
VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gx, gy);
|
||||
}
|
||||
else
|
||||
((MapInstanced*)m_parentMap)->RemoveGridMapReference(GridPair(gx, gy));
|
||||
((Mainstanced*)m_parentMap)->RemoveGridMapReference(GridPair(gx, gy));
|
||||
|
||||
GridMaps[gx][gy] = NULL;
|
||||
}
|
||||
@@ -1604,7 +1603,6 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps, float maxSearchD
|
||||
return vmapHeight;
|
||||
else
|
||||
return mapHeight; // better use .map surface height
|
||||
|
||||
}
|
||||
else
|
||||
return vmapHeight; // we have only vmapHeight (if have)
|
||||
@@ -2656,7 +2654,6 @@ void BattlegroundMap::RemoveAllPlayers()
|
||||
if (Player* plr = itr->getSource())
|
||||
if (!plr->IsBeingTeleportedFar())
|
||||
plr->TeleportTo(plr->GetBattlegroundEntryPoint());
|
||||
|
||||
}
|
||||
|
||||
Creature*
|
||||
@@ -2681,4 +2678,4 @@ void Map::UpdateIteratorBack(Player* player)
|
||||
{
|
||||
if (m_mapRefIter == player->GetMapRef())
|
||||
m_mapRefIter = m_mapRefIter->nocheck_prev();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user