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:
Bootz
2011-10-07 19:45:43 -05:00
parent c89b1f6989
commit 5b4c7783c2
324 changed files with 4886 additions and 4849 deletions
+5 -5
View File
@@ -153,9 +153,9 @@ bool ChatHandler::HandleSummonCommand(const char* args)
return false;
}
Map* pMap = m_session->GetPlayer()->GetMap();
Map* map = m_session->GetPlayer()->GetMap();
if (pMap->IsBattlegroundOrArena())
if (map->IsBattlegroundOrArena())
{
// only allow if gm mode is on
if (!_player->isGameMaster())
@@ -175,12 +175,12 @@ bool ChatHandler::HandleSummonCommand(const char* args)
if (!target->GetMap()->IsBattlegroundOrArena())
target->SetBattlegroundEntryPoint();
}
else if (pMap->IsDungeon())
else if (map->IsDungeon())
{
Map* cMap = target->GetMap();
if (cMap->Instanceable() && cMap->GetInstanceId() != pMap->GetInstanceId())
target->UnbindInstance(pMap->GetInstanceId(), target->GetDungeonDifficulty(), true);
if (cMap->Instanceable() && cMap->GetInstanceId() != map->GetInstanceId())
target->UnbindInstance(map->GetInstanceId(), target->GetDungeonDifficulty(), true);
// we are in instance, and can summon only player in our group with us as lead
if (!m_session->GetPlayer()->GetGroup() || !target->GetGroup() ||
+3 -3
View File
@@ -4124,7 +4124,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args)
if (!player)
player = m_session->GetPlayer();
char* pMap = strtok((char*)args, " ");
char* map = strtok((char*)args, " ");
char* pDiff = strtok(NULL, " ");
int8 diff = -1;
if (pDiff)
@@ -4132,9 +4132,9 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args)
uint16 counter = 0;
uint16 MapId = 0;
if (strcmp(pMap, "all"))
if (strcmp(map, "all"))
{
MapId = uint16(atoi(pMap));
MapId = uint16(atoi(map));
if (!MapId)
return false;
}