josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Script: Code style.

Browse Source 
Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-16 19:40:57 +08:00
parent ddc0f5d7d6
commit bef1b0c402
55 changed files with 220 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+2 -1
View File
@@ -75,7 +75,8 @@ public:
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+9 -4
View File
@@ -566,7 +566,9 @@ public:
void KilledUnit(Unit* victim)
{
if (victim == me) return;
if (victim == me)
return;
// TODO: Find better way to handle emote
switch (urand(0, 1))
{
@@ -747,7 +749,8 @@ public:
final.y = 2 * final.y - initial.y;
Creature* Trigger = me->SummonCreature(23069, initial.x, initial.y, initial.z, 0, TEMPSUMMON_TIMED_DESPAWN, 13000);
if (!Trigger) return;
if (!Trigger)
return;
Trigger->SetSpeed(MOVE_WALK, 3);
Trigger->SetWalk(true);
@@ -2137,9 +2140,11 @@ public:
void UpdateAI(const uint32 /*diff*/)
{
if (!UpdateVictim()) return;
if (!UpdateVictim())
return;
if (me->getVictim()->GetTypeId() != TYPEID_PLAYER) return; // Only cast the below on players.
if (me->getVictim()->GetTypeId() != TYPEID_PLAYER)
return; // Only cast the below on players.
if (!me->getVictim()->HasAura(SPELL_PARALYZE))
{
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+4 -1
View File
@@ -197,8 +197,11 @@ public:
uint32 random = rand()%6;
float x = Coords[random].x;
float y = Coords[random].y;
Creature* Soul = me->SummonCreature(CREATURE_ENSLAVED_SOUL, x, y, me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0);
if (!Soul) return false;
if (!Soul)
return false;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
CAST_AI(npc_enslaved_soul::npc_enslaved_soulAI, Soul->AI())->ReliquaryGUID = me->GetGUID();
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+2 -1
View File
@@ -320,7 +320,8 @@ public:
void AttackStart(Unit* who)
{
if (!who || IsBanished) return;
if (!who || IsBanished)
return;
if (who->isTargetableForAttack() && who != me)
DoStartMovement(who);
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+2 -1
View File
@@ -316,7 +316,8 @@ public:
void SetThreatList(Creature* Blossom)
{
if (!Blossom) return;
if (!Blossom)
return;
std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
std::list<HostileReference*>::const_iterator i = m_threatlist.begin();
src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+3 -1
View File
@@ -130,7 +130,9 @@ public:
bool RemoveImpalingSpine()
{
if (!SpineTargetGUID) return false;
if (!SpineTargetGUID)
return false;
Unit* target = Unit::GetUnit(*me, SpineTargetGUID);
if (target && target->HasAura(SPELL_IMPALING_SPINE))
target->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE);
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+2 -1
View File
@@ -313,7 +313,8 @@ public:
void UpdateAI(const uint32 diff)
{
if (!EventBegun) return;
if (!EventBegun)
return;
if (EndEventTimer)
{
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+2 -1
View File
@@ -118,7 +118,8 @@ public:
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+2 -1
View File
@@ -112,7 +112,8 @@ public:
void EnterCombat(Unit* /*who*/)
{
if (!victimGUID) return;
if (!victimGUID)
return;
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+2 -3
View File
@@ -383,12 +383,11 @@ public:
void MoveInLineOfSight(Unit* who)
{
if (!who || me->getVictim()) return;
if (!who || me->getVictim())
return;
if (who->isInAccessiblePlaceFor(me) && me->IsValidAttackTarget(who) && me->IsWithinDistInMap(who, 45))
{
AttackStart(who);
}
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+2 -1
View File
@@ -77,7 +77,8 @@ public:
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+3 -1
View File
@@ -158,7 +158,9 @@ class boss_kelidan_the_breaker : public CreatureScript
uint64 GetChanneled(Creature* channeler1)
{
SummonChannelers();
if (!channeler1) return 0;
if (!channeler1)
return 0;
uint8 i;
for (i=0; i<5; ++i)
{
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+3 -1
View File
@@ -80,7 +80,9 @@ class instance_magtheridons_lair : public InstanceMapScript
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+2 -1
View File
@@ -78,7 +78,8 @@ class instance_the_eye : public InstanceMapScript
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ class instance_mechanar : public InstanceMapScript
return false;
}
uint64 GetData64 (uint32 /*identifier*/)
uint64 GetData64(uint32 /*identifier*/)
{
return 0;
}
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+2 -1
View File
@@ -93,7 +93,8 @@ class instance_arcatraz : public InstanceMapScript
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
}
src/server/scripts/Outland/blades_edge_mountains.cpp
+2 -1
View File
@@ -492,7 +492,8 @@ public:
void MoveInLineOfSight(Unit* who)
{
if (!who || (!who->isAlive())) return;
if (!who || (!who->isAlive()))
return;
if (me->IsWithinDistInMap(who, 50.0f))
{
src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "ScriptPCH.h"
enum Yells
enum Texts
{
SAY_INTRO = 0,
SAY_AGGRO = 1,
src/server/scripts/Outland/boss_doomwalker.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "ScriptPCH.h"
enum Yells
enum Texts
{
SAY_AGGRO = 0,
SAY_EARTHQUAKE = 1,
src/server/scripts/Outland/netherstorm.cpp
+1 -1
View File
@@ -394,7 +394,7 @@ public:
struct npc_commander_dawnforgeAI : public ScriptedAI
{
npc_commander_dawnforgeAI(Creature* creature) : ScriptedAI(creature) { Reset (); }
npc_commander_dawnforgeAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
uint64 PlayerGUID;
uint64 ardonisGUID;
src/server/scripts/Outland/shadowmoon_valley.cpp
+3 -2
View File
@@ -1727,7 +1727,7 @@ public:
{
npc_enraged_spiritAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() { }
void Reset() { }
void EnterCombat(Unit* /*who*/){}
@@ -1739,7 +1739,8 @@ public:
uint32 entry = 0;
uint32 credit = 0;
switch (me->GetEntry()) {
switch (me->GetEntry())
{
case ENTRY_ENRAGED_FIRE_SPIRIT:
entry = ENTRY_FIERY_SOUL;
//credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT;