Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-17 17:54:48 +08:00
parent 7877eae6ba
commit 5cb16b65fc
11 changed files with 153 additions and 106 deletions
@@ -392,7 +392,10 @@ public:
GlaiveGUID = 0;
}
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
void EnterCombat(Unit* /*who*/)
{
DoZoneInCombat();
}
void ChargeCheck()
{
@@ -2093,7 +2096,6 @@ public:
// }
}
};
};
class gameobject_cage_trap : public GameObjectScript
@@ -2112,7 +2114,6 @@ public:
go->SetGoState(GO_STATE_ACTIVE);
return true;
}
};
class mob_shadow_demon : public CreatureScript
@@ -2131,7 +2132,10 @@ public:
uint64 TargetGUID;
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
void EnterCombat(Unit* /*who*/)
{
DoZoneInCombat();
}
void Reset()
{
@@ -2165,7 +2169,6 @@ public:
DoCast(me->getVictim(), SPELL_CONSUME_SOUL);
}
};
};
class mob_blade_of_azzinoth : public CreatureScript
@@ -2224,7 +2227,10 @@ public:
DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true);
}
void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); }
void EnterCombat(Unit* /*who*/)
{
DoZoneInCombat();
}
void DoMeleeAttackIfReady()
{
@@ -2270,7 +2276,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_illidan()
@@ -865,7 +865,6 @@ public:
bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets)
{
InstanceScript* instance = player->GetInstanceScript();
if (!instance)
{
player->GetSession()->SendNotification(TEXT_NOT_INITIALIZED);
@@ -908,12 +907,8 @@ public:
}
// get and remove channel
if (Unit* channel = Unit::GetCreature(*vashj, CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->ShieldGeneratorChannel[channelIdentifier]))
{
// call Unsummon()
channel->setDeathState(JUST_DIED);
}
channel->setDeathState(JUST_DIED); // call Unsummon()
instance->SetData(identifier, 1);