aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorMalcrom <malcromdev@gmail.com>2013-06-11 19:54:27 -0230
committerMalcrom <malcromdev@gmail.com>2013-06-11 19:54:27 -0230
commit66978cfc3b672309ed79da917695bc59427974aa (patch)
treede60f66490b11865b4f652bd7ec580da0e809ff3 /src/server/game/Handlers/MiscHandler.cpp
parent46374bf533987b492abd590d7cd2ae182b35bd39 (diff)
Core: Some function renaming.
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 088a13cd7c6..34db0782c57 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -62,7 +62,7 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket& recvData)
recvData.read_skip<uint8>();
- if (GetPlayer()->isAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+ if (GetPlayer()->IsAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
return;
if (GetPlayer()->HasAuraType(SPELL_AURA_PREVENT_RESURRECTION))
@@ -372,14 +372,14 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/)
if (uint64 lguid = GetPlayer()->GetLootGUID())
DoLootRelease(lguid);
- bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->isInCombat()) ||
- GetPlayer()->isInFlight() || HasPermission(RBAC_PERM_INSTANT_LOGOUT);
+ bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) ||
+ GetPlayer()->IsInFlight() || HasPermission(RBAC_PERM_INSTANT_LOGOUT);
/// TODO: Possibly add RBAC permission to log out in combat
bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
uint32 reason = 0;
- if (GetPlayer()->isInCombat() && !canLogoutInCombat)
+ if (GetPlayer()->IsInCombat() && !canLogoutInCombat)
reason = 1;
else if (GetPlayer()->m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FALLING | MOVEMENTFLAG_FALLING_FAR))
reason = 3; // is jumping or falling
@@ -734,7 +734,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket& recvData)
uint64 guid;
recvData >> guid;
- if (GetPlayer()->isAlive())
+ if (GetPlayer()->IsAlive())
return;
// do not allow corpse reclaim in arena
@@ -773,7 +773,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData)
recvData >> guid;
recvData >> status;
- if (GetPlayer()->isAlive())
+ if (GetPlayer()->IsAlive())
return;
if (status == 0)
@@ -813,7 +813,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData)
TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "CMSG_AREATRIGGER. Trigger ID: %u", triggerId);
Player* player = GetPlayer();
- if (player->isInFlight())
+ if (player->IsInFlight())
{
TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",
player->GetName().c_str(), player->GetGUIDLow(), triggerId);
@@ -887,7 +887,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData)
if (sScriptMgr->OnAreaTrigger(player, atEntry))
return;
- if (player->isAlive())
+ if (player->IsAlive())
if (uint32 questId = sObjectMgr->GetQuestForAreaTrigger(triggerId))
if (player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(questId);
@@ -1235,7 +1235,7 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recvData)
TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_WORLD_TELEPORT");
- if (GetPlayer()->isInFlight())
+ if (GetPlayer()->IsInFlight())
{
TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.",
GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow());
@@ -1575,7 +1575,7 @@ void WorldSession::HandleCancelMountAuraOpcode(WorldPacket& /*recvData*/)
return;
}
- if (_player->isInFlight()) // not blizz like; no any messages on blizz
+ if (_player->IsInFlight()) // not blizz like; no any messages on blizz
{
ChatHandler(this).SendSysMessage(LANG_YOU_IN_FLIGHT);
return;
@@ -1670,7 +1670,7 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket& recvData)
if (!unit)
return;
- if (!unit->isSpiritService()) // it's not spirit service
+ if (!unit->IsSpiritService()) // it's not spirit service
return;
if (bg)
@@ -1693,7 +1693,7 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData)
if (!unit)
return;
- if (!unit->isSpiritService()) // it's not spirit service
+ if (!unit->IsSpiritService()) // it's not spirit service
return;
if (bg)
@@ -1705,7 +1705,7 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData)
void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recvData*/)
{
- if (_player->isInFlight())
+ if (_player->IsInFlight())
return;
if (/*Battlefield* bf = */sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))