aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
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/scripts/Commands
parent46374bf533987b492abd590d7cd2ae182b35bd39 (diff)
Core: Some function renaming.
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_cast.cpp4
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp2
-rw-r--r--src/server/scripts/Commands/cs_go.cpp18
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp22
-rw-r--r--src/server/scripts/Commands/cs_modify.cpp8
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp12
-rw-r--r--src/server/scripts/Commands/cs_tele.cpp8
7 files changed, 37 insertions, 37 deletions
diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp
index cb4f0ecf68d..d0793e9ca54 100644
--- a/src/server/scripts/Commands/cs_cast.cpp
+++ b/src/server/scripts/Commands/cs_cast.cpp
@@ -230,7 +230,7 @@ public:
return false;
}
- if (!caster->getVictim())
+ if (!caster->GetVictim())
{
handler->SendSysMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM);
handler->SetSentErrorMessage(true);
@@ -256,7 +256,7 @@ public:
bool triggered = (triggeredStr != NULL);
- caster->CastSpell(caster->getVictim(), spellId, triggered);
+ caster->CastSpell(caster->GetVictim(), spellId, triggered);
return true;
}
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 6c6721fcf17..b3b4d935726 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -796,7 +796,7 @@ public:
static bool HandleDebugThreatListCommand(ChatHandler* handler, char const* /*args*/)
{
Creature* target = handler->getSelectedCreature();
- if (!target || target->isTotem() || target->IsPet())
+ if (!target || target->IsTotem() || target->IsPet())
return false;
ThreatContainer::StorageType const &threatList = target->getThreatManager().getThreatList();
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 11aa02ce648..d911d123ec2 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -154,7 +154,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -199,7 +199,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -241,7 +241,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -301,7 +301,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -346,7 +346,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -391,7 +391,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -461,7 +461,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -522,7 +522,7 @@ public:
}
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -556,7 +556,7 @@ public:
}
Player* player = handler->GetSession()->GetPlayer();
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 37999124d83..556857aff49 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -384,7 +384,7 @@ public:
handler->PSendSysMessage(LANG_APPEARING_AT, chrNameLink.c_str());
// stop flight if need
- if (_player->isInFlight())
+ if (_player->IsInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->CleanupAfterTaxiFlight();
@@ -418,7 +418,7 @@ public:
return false;
// stop flight if need
- if (_player->isInFlight())
+ if (_player->IsInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->CleanupAfterTaxiFlight();
@@ -509,7 +509,7 @@ public:
ChatHandler(target->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->playerLink(_player->GetName()).c_str());
// stop flight if need
- if (target->isInFlight())
+ if (target->IsInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->CleanupAfterTaxiFlight();
@@ -620,7 +620,7 @@ public:
ChatHandler(player->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->GetNameLink().c_str());
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -661,7 +661,7 @@ public:
return false;
}
- if (target->isAlive())
+ if (target->IsAlive())
{
if (sWorld->getBoolConfig(CONFIG_DIE_COMMAND_MODE))
handler->GetSession()->GetPlayer()->Kill(target);
@@ -704,7 +704,7 @@ public:
return false;
}
- if (player->isInFlight())
+ if (player->IsInFlight())
{
handler->SendSysMessage(LANG_YOU_IN_FLIGHT);
handler->SetSentErrorMessage(true);
@@ -869,7 +869,7 @@ public:
}
// stop flight if need
- if (target->isInFlight())
+ if (target->IsInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->CleanupAfterTaxiFlight();
@@ -965,7 +965,7 @@ public:
if (!handler->extractPlayerTarget(player_str, &player))
return false;
- if (player->isInFlight() || player->isInCombat())
+ if (player->IsInFlight() || player->IsInCombat())
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(7355);
if (!spellInfo)
@@ -1612,7 +1612,7 @@ public:
muteTime = target->GetSession()->m_muteTime;
mapId = target->GetMapId();
areaId = target->GetAreaId();
- alive = target->isAlive() ? "Yes" : "No";
+ alive = target->IsAlive() ? "Yes" : "No";
gender = target->getGender();
phase = target->GetPhaseMask();
}
@@ -2233,7 +2233,7 @@ public:
return false;
}
- if (!target->isAlive())
+ if (!target->IsAlive())
return true;
char* damageStr = strtok((char*)args, " ");
@@ -2780,7 +2780,7 @@ public:
{
pet->SavePetToDB(PET_SAVE_AS_CURRENT);
// not let dismiss dead pet
- if (pet->isAlive())
+ if (pet->IsAlive())
player->RemovePet(pet, PET_SAVE_NOT_IN_SLOT);
}
}
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index 55d92ea014f..07d1e7d4b18 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -490,7 +490,7 @@ public:
std::string targetNameLink = handler->GetNameLink(target);
- if (target->isInFlight())
+ if (target->IsInFlight())
{
handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str());
handler->SetSentErrorMessage(true);
@@ -538,7 +538,7 @@ public:
std::string targetNameLink = handler->GetNameLink(target);
- if (target->isInFlight())
+ if (target->IsInFlight())
{
handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str());
handler->SetSentErrorMessage(true);
@@ -583,7 +583,7 @@ public:
std::string targetNameLink = handler->GetNameLink(target);
- if (target->isInFlight())
+ if (target->IsInFlight())
{
handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str());
handler->SetSentErrorMessage(true);
@@ -628,7 +628,7 @@ public:
std::string targetNameLink = handler->GetNameLink(target);
- if (target->isInFlight())
+ if (target->IsInFlight())
{
handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str());
handler->SetSentErrorMessage(true);
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index bd4b3f8178b..bacbe753926 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -320,7 +320,7 @@ public:
{
creature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
creature->GetMotionMaster()->Initialize();
- if (creature->isAlive()) // dead creature will reset movement generator at respawn
+ if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->Respawn(true);
@@ -435,7 +435,7 @@ public:
else
unit = handler->getSelectedCreature();
- if (!unit || unit->IsPet() || unit->isTotem())
+ if (!unit || unit->IsPet() || unit->IsTotem())
{
handler->SendSysMessage(LANG_SELECT_CREATURE);
handler->SetSentErrorMessage(true);
@@ -459,7 +459,7 @@ public:
return false;
Creature* vendor = handler->getSelectedCreature();
- if (!vendor || !vendor->isVendor())
+ if (!vendor || !vendor->IsVendor())
{
handler->SendSysMessage(LANG_COMMAND_VENDORSELECTION);
handler->SetSentErrorMessage(true);
@@ -776,7 +776,7 @@ public:
}
creature->SetPosition(x, y, z, o);
creature->GetMotionMaster()->Initialize();
- if (creature->isAlive()) // dead creature will reset movement generator at respawn
+ if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->Respawn();
@@ -978,7 +978,7 @@ public:
creature->SetDefaultMovementType(move_type);
creature->GetMotionMaster()->Initialize();
- if (creature->isAlive()) // dead creature will reset movement generator at respawn
+ if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->Respawn();
@@ -1056,7 +1056,7 @@ public:
creature->SetRespawnRadius((float)option);
creature->SetDefaultMovementType(mtype);
creature->GetMotionMaster()->Initialize();
- if (creature->isAlive()) // dead creature will reset movement generator at respawn
+ if (creature->IsAlive()) // dead creature will reset movement generator at respawn
{
creature->setDeathState(JUST_DIED);
creature->Respawn();
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index fcc0875ca4f..1572cc65505 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -183,7 +183,7 @@ public:
ChatHandler(target->GetSession()).PSendSysMessage(LANG_TELEPORTED_TO_BY, handler->GetNameLink().c_str());
// stop flight if need
- if (target->isInFlight())
+ if (target->IsInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->CleanupAfterTaxiFlight();
@@ -279,7 +279,7 @@ public:
ChatHandler(player->GetSession()).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
// stop flight if need
- if (player->isInFlight())
+ if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
@@ -311,7 +311,7 @@ public:
return false;
}
- if (me->isInCombat())
+ if (me->IsInCombat())
{
handler->SendSysMessage(LANG_YOU_IN_COMBAT);
handler->SetSentErrorMessage(true);
@@ -327,7 +327,7 @@ public:
}
// stop flight if need
- if (me->isInFlight())
+ if (me->IsInFlight())
{
me->GetMotionMaster()->MovementExpired();
me->CleanupAfterTaxiFlight();