Core: Clean up script variables to make variables consistant/standardized, and some additional warning-removals:
+ Fix compilewarning in Unit.cpp + Remove/comment out unused parameters for some commandscripts/scripts (warnings) + Replace "plr" with "player" all over the scriptbase for consistency
This commit is contained in:
@@ -60,13 +60,13 @@ public:
|
||||
{
|
||||
if (FlyBackTimer <= diff)
|
||||
{
|
||||
Player* plr = NULL;
|
||||
Player* player = NULL;
|
||||
if (me->isSummon())
|
||||
if (Unit* summoner = me->ToTempSummon()->GetSummoner())
|
||||
if (summoner->GetTypeId() == TYPEID_PLAYER)
|
||||
plr = CAST_PLR(summoner);
|
||||
player = CAST_PLR(summoner);
|
||||
|
||||
if (!plr)
|
||||
if (!player)
|
||||
phase = 3;
|
||||
|
||||
switch(phase)
|
||||
@@ -77,19 +77,19 @@ public:
|
||||
FlyBackTimer = 500;
|
||||
break;
|
||||
case 1:
|
||||
plr->GetClosePoint(x, y, z, me->GetObjectSize());
|
||||
player->GetClosePoint(x, y, z, me->GetObjectSize());
|
||||
z += 2.5; x -= 2; y -= 1.5;
|
||||
me->GetMotionMaster()->MovePoint(0, x, y, z);
|
||||
me->SetUInt64Value(UNIT_FIELD_TARGET, plr->GetGUID());
|
||||
me->SetUInt64Value(UNIT_FIELD_TARGET, player->GetGUID());
|
||||
me->SetVisible(true);
|
||||
FlyBackTimer = 4500;
|
||||
break;
|
||||
case 2:
|
||||
if (!plr->isRessurectRequested())
|
||||
if (!player->isRessurectRequested())
|
||||
{
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOMSPELL01);
|
||||
DoCast(plr, SPELL_REVIVE, true);
|
||||
me->MonsterWhisper(VALK_WHISPER, plr->GetGUID());
|
||||
DoCast(player, SPELL_REVIVE, true);
|
||||
me->MonsterWhisper(VALK_WHISPER, player->GetGUID());
|
||||
}
|
||||
FlyBackTimer = 5000;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user