aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-23 22:16:28 +0100
committerNay <dnpd.dd@gmail.com>2012-09-23 22:16:28 +0100
commita7386bd1b3e0c53b41473326eb42d8a06cacbf96 (patch)
tree9975778248a15d09d9214fc94b6bf765a3e81f03 /src
parent91fd408446e411fad364fa46919adb9bd93dbddd (diff)
Scripts: Fix some code style issues in scripts
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Spells/SpellMgr.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp4
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp48
4 files changed, 27 insertions, 29 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index c692a3d6991..70ec7bd4d68 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2989,7 +2989,7 @@ void SpellMgr::LoadDbcDataCorrections()
switch (spellInfo->Id)
{
- case 42730:
+ case 42730:
spellInfo->EffectTriggerSpell[EFFECT_1] = 42739;
break;
case 59735:
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index 76237fe1890..270e31f4350 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -133,7 +133,7 @@ public:
struct boss_eregosAI : public BossAI
{
boss_eregosAI(Creature* creature) : BossAI(creature, DATA_EREGOS_EVENT) { }
-
+
void Reset()
{
_Reset();
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index 35bf7ee0b10..c694aa88338 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -166,7 +166,7 @@ public:
};
};
-enum TickingTimeBomb
+enum TickingTimeBomb
{
SPELL_TICKING_TIME_BOMB_EXPLODE = 59687
};
@@ -189,7 +189,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader
if (GetCaster() == GetTarget())
{
GetTarget()->CastSpell(GetTarget(), SPELL_TICKING_TIME_BOMB_EXPLODE, true);
- }
+ }
}
void Register()
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index f4139f2ffc2..224d06e9d3c 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -1696,9 +1696,7 @@ public:
void Reset()
{
if (me->GetReactState() != REACT_PASSIVE)
- {
me->SetReactState(REACT_PASSIVE);
- }
rebuff = 0;
}
@@ -1738,33 +1736,33 @@ public:
void GotStinged(uint64 casterGUID)
{
- if(Player* caster = Player::GetPlayer(*me, casterGUID))
+ if (Player* caster = Player::GetPlayer(*me, casterGUID))
{
uint32 step = caster->GetAuraCount(SPELL_NEURAL_NEEDLE) + 1;
switch (step)
{
- case 1:
- DoScriptText(SAY_IMPRISIONED_BERYL_1, me);
- break;
- case 2:
- DoScriptText(SAY_IMPRISIONED_BERYL_2, me, caster);
- break;
- case 3:
- DoScriptText(SAY_IMPRISIONED_BERYL_3, me);
- break;
- case 4:
- DoScriptText(SAY_IMPRISIONED_BERYL_4, me);
- break;
- case 5:
- DoScriptText(SAY_IMPRISIONED_BERYL_5, me);
- break;
- case 6:
- DoScriptText(SAY_IMPRISIONED_BERYL_6, me, caster);
- break;
- case 7:
- DoScriptText(SAY_IMPRISIONED_BERYL_7, me);
- caster->KilledMonsterCredit(25478, 0);
- break;
+ case 1:
+ DoScriptText(SAY_IMPRISIONED_BERYL_1, me);
+ break;
+ case 2:
+ DoScriptText(SAY_IMPRISIONED_BERYL_2, me, caster);
+ break;
+ case 3:
+ DoScriptText(SAY_IMPRISIONED_BERYL_3, me);
+ break;
+ case 4:
+ DoScriptText(SAY_IMPRISIONED_BERYL_4, me);
+ break;
+ case 5:
+ DoScriptText(SAY_IMPRISIONED_BERYL_5, me);
+ break;
+ case 6:
+ DoScriptText(SAY_IMPRISIONED_BERYL_6, me, caster);
+ break;
+ case 7:
+ DoScriptText(SAY_IMPRISIONED_BERYL_7, me);
+ caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER, 0);
+ break;
}
}
}