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

Scripts: Fix some code style issues in scripts

Browse Source
This commit is contained in:
Nay
2012-09-23 22:16:28 +01:00
parent 91fd408446
commit a7386bd1b3
4 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellMgr.cpp
+1 -1
View File
@@ -2989,7 +2989,7 @@ void SpellMgr::LoadDbcDataCorrections()
switch (spellInfo->Id) switch (spellInfo->Id)
{ {
case 42730: case 42730:
spellInfo->EffectTriggerSpell[EFFECT_1] = 42739; spellInfo->EffectTriggerSpell[EFFECT_1] = 42739;
break; break;
case 59735: case 59735:
src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ public:
struct boss_eregosAI : public BossAI struct boss_eregosAI : public BossAI
{ {
boss_eregosAI(Creature* creature) : BossAI(creature, DATA_EREGOS_EVENT) { } boss_eregosAI(Creature* creature) : BossAI(creature, DATA_EREGOS_EVENT) { }
void Reset() void Reset()
{ {
_Reset(); _Reset();
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+2 -2
View File
@@ -166,7 +166,7 @@ public:
}; };
}; };
enum TickingTimeBomb enum TickingTimeBomb
{ {
SPELL_TICKING_TIME_BOMB_EXPLODE = 59687 SPELL_TICKING_TIME_BOMB_EXPLODE = 59687
}; };
@@ -189,7 +189,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader
if (GetCaster() == GetTarget()) if (GetCaster() == GetTarget())
{ {
GetTarget()->CastSpell(GetTarget(), SPELL_TICKING_TIME_BOMB_EXPLODE, true); GetTarget()->CastSpell(GetTarget(), SPELL_TICKING_TIME_BOMB_EXPLODE, true);
} }
} }
void Register() void Register()
src/server/scripts/Northrend/borean_tundra.cpp
+23 -25
View File
@@ -1696,9 +1696,7 @@ public:
void Reset() void Reset()
{ {
if (me->GetReactState() != REACT_PASSIVE) if (me->GetReactState() != REACT_PASSIVE)
{
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
}
rebuff = 0; rebuff = 0;
} }
@@ -1738,33 +1736,33 @@ public:
void GotStinged(uint64 casterGUID) 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; uint32 step = caster->GetAuraCount(SPELL_NEURAL_NEEDLE) + 1;
switch (step) switch (step)
{ {
case 1: case 1:
DoScriptText(SAY_IMPRISIONED_BERYL_1, me); DoScriptText(SAY_IMPRISIONED_BERYL_1, me);
break; break;
case 2: case 2:
DoScriptText(SAY_IMPRISIONED_BERYL_2, me, caster); DoScriptText(SAY_IMPRISIONED_BERYL_2, me, caster);
break; break;
case 3: case 3:
DoScriptText(SAY_IMPRISIONED_BERYL_3, me); DoScriptText(SAY_IMPRISIONED_BERYL_3, me);
break; break;
case 4: case 4:
DoScriptText(SAY_IMPRISIONED_BERYL_4, me); DoScriptText(SAY_IMPRISIONED_BERYL_4, me);
break; break;
case 5: case 5:
DoScriptText(SAY_IMPRISIONED_BERYL_5, me); DoScriptText(SAY_IMPRISIONED_BERYL_5, me);
break; break;
case 6: case 6:
DoScriptText(SAY_IMPRISIONED_BERYL_6, me, caster); DoScriptText(SAY_IMPRISIONED_BERYL_6, me, caster);
break; break;
case 7: case 7:
DoScriptText(SAY_IMPRISIONED_BERYL_7, me); DoScriptText(SAY_IMPRISIONED_BERYL_7, me);
caster->KilledMonsterCredit(25478, 0); caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER, 0);
break; break;
} }
} }
} }