Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3872 from Bootz/master

Browse Source 
Codestyle clean-up
This commit is contained in:
Shocker
2011-11-09 02:31:18 -08:00
parent dc4690f970 d1334624da
commit c2a2a4f713
87 changed files with 1129 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/scripts/Commands/cs_tele.cpp
View File

@@ -228,38 +228,38 @@ public:
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player* pl = itr->getSource();
Player* player = itr->getSource();
if (!pl || !pl->GetSession())
if (!player || !player->GetSession())
continue;
// check online security
if (handler->HasLowerSecurity(pl, 0))
if (handler->HasLowerSecurity(player, 0))
return false;
std::string plNameLink = handler->GetNameLink(pl);
std::string plNameLink = handler->GetNameLink(player);
if (pl->IsBeingTeleported())
if (player->IsBeingTeleported())
{
handler->PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
continue;
}
handler->PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(), "", tele->name.c_str());
if (handler->needReportToTarget(pl))
(ChatHandler(pl)).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
if (handler->needReportToTarget(player))
(ChatHandler(player)).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
// stop flight if need
if (pl->isInFlight())
if (player->isInFlight())
{
pl->GetMotionMaster()->MovementExpired();
pl->CleanupAfterTaxiFlight();
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
pl->SaveRecallPosition();
player->SaveRecallPosition();
pl->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
player->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
}
return true;

4
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
View File

@@ -641,7 +641,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void BeginEvent(Player* pl)
void BeginEvent(Player* player)
{
if (!instance)
return;
@@ -662,7 +662,7 @@ public:
me->CombatStart(Shade);
Shade->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
Shade->SetTarget(me->GetGUID());
if (pl) Shade->AddThreat(pl, 1.0f);
if (player) Shade->AddThreat(player, 1.0f);
DoZoneInCombat(Shade);
EventBegun = true;
}