aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-17 12:17:15 +0800
committerGyx <2359980687@qq.com>2012-03-17 12:17:15 +0800
commit7877eae6ba00d3072eb020a045028e0c825a3831 (patch)
tree5047745028b8c9b7d03687edf112a1106054b548 /src/server/scripts/Kalimdor
parent68ad764e2e603b7939d66cf714c5e67a126a6634 (diff)
Core/Script: Code style and remove unused core.
Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp14
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp27
-rw-r--r--src/server/scripts/Kalimdor/azshara.cpp1
-rw-r--r--src/server/scripts/Kalimdor/azuremyst_isle.cpp9
4 files changed, 37 insertions, 14 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 0bcf33229f1..f36aa19a7be 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -896,9 +896,17 @@ void hyjalAI::UpdateAI(const uint32 diff)
switch (Spells[i].TargetType)
{
- case TARGETTYPE_SELF: target = me; break;
- case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break;
- case TARGETTYPE_VICTIM: target = me->getVictim(); break;
+ case TARGETTYPE_SELF:
+ target = me;
+ break;
+
+ case TARGETTYPE_RANDOM:
+ target = SelectTarget(SELECT_TARGET_RANDOM, 0);
+ break;
+
+ case TARGETTYPE_VICTIM:
+ target = me->getVictim();
+ break;
}
if (target && target->isAlive())
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 1eaaf418598..ad8ebdb370a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -176,17 +176,23 @@ public:
{
switch (type)
{
- case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break;
+ case DATA_RAGEWINTERCHILLEVENT:
+ m_auiEncounter[0] = data;
+ break;
case DATA_ANETHERONEVENT:
m_auiEncounter[1] = data;
break;
- case DATA_KAZROGALEVENT: m_auiEncounter[2] = data; break;
+ case DATA_KAZROGALEVENT:
+ m_auiEncounter[2] = data;
+ break;
case DATA_AZGALOREVENT:
{
m_auiEncounter[3] = data;
if (data == DONE)
{
- if (ArchiYell)break;
+ if (ArchiYell)
+ break;
+
ArchiYell = true;
Creature* creature = instance->GetCreature(Azgalor);
@@ -220,12 +226,17 @@ public:
}
}
break;
- case DATA_ARCHIMONDEEVENT: m_auiEncounter[4] = data; break;
- case DATA_RESET_TRASH_COUNT: Trash = 0; break;
-
+ case DATA_ARCHIMONDEEVENT:
+ m_auiEncounter[4] = data;
+ break;
+ case DATA_RESET_TRASH_COUNT:
+ Trash = 0;
+ break;
case DATA_TRASH:
- if (data) Trash = data;
- else Trash--;
+ if (data)
+ Trash = data;
+ else
+ Trash--;
DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash);
break;
case TYPE_RETREAT:
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 2b74420ff3a..2e7b0a684c1 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -516,7 +516,6 @@ public:
{
}
};
-
};
void AddSC_azshara()
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 6c322a1dee1..fd86a08f06a 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -309,8 +309,13 @@ public:
me->SetHealth(me->CountPctFromMaxHealth(15));
switch (rand()%2)
{
- case 0: me->SetStandState(UNIT_STAND_STATE_SIT); break;
- case 1: me->SetStandState(UNIT_STAND_STATE_SLEEP); break;
+ case 0:
+ me->SetStandState(UNIT_STAND_STATE_SIT);
+ break;
+
+ case 1:
+ me->SetStandState(UNIT_STAND_STATE_SLEEP);
+ break;
}
}