diff options
| author | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
| commit | 0fb8f057974cdf3107084be65005956efb5191dc (patch) | |
| tree | 8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/scripts/Examples | |
| parent | f96e1ce1d7b10074750da761ff9b219a24d0f09f (diff) | |
| parent | 1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/scripts/Examples')
| -rw-r--r-- | src/server/scripts/Examples/example_creature.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Examples/example_spell.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 7cc62b1d49d..85609aab584 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -112,7 +112,7 @@ class example_creature : public CreatureScript m_uiPhase = 1; // Start in phase 1 m_uiPhaseTimer = 60000; // 60 seconds m_uiSpell1Timer = 5000; // 5 seconds - m_uiSpell2Timer = urand(10000,20000); // between 10 and 20 seconds + m_uiSpell2Timer = urand(10000, 20000); // between 10 and 20 seconds m_uiSpell3Timer = 19000; // 19 seconds m_uiBeserkTimer = 120000; // 2 minutes @@ -170,7 +170,7 @@ class example_creature : public CreatureScript if (m_uiSayTimer <= uiDiff) { //Random switch between 5 outcomes - DoScriptText(RAND(SAY_RANDOM_0,SAY_RANDOM_1,SAY_RANDOM_2,SAY_RANDOM_3,SAY_RANDOM_4), me); + DoScriptText(RAND(SAY_RANDOM_0, SAY_RANDOM_1, SAY_RANDOM_2, SAY_RANDOM_3, SAY_RANDOM_4), me); m_uiSayTimer = 45000; //Say something agian in 45 seconds } diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 6dfb21bf3f8..212ed450ed5 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -245,7 +245,7 @@ class spell_ex_66244 : public SpellScriptLoader { OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_ex_66244AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic,EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_DUMMY); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_ex_66244AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_ex_66244AuraScript::HandleEffectCalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); |