From 0105bc849fd062d2a8a8110e6c3cfefb70da0e16 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 Jan 2013 21:47:38 -0330 Subject: Core/Scripting: Misc clean up and a warning fix --- .../BattleForMountHyjal/boss_rage_winterchill.cpp | 12 ++++++------ .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 2dfa62f36a1..84ef05779ee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -25,16 +25,16 @@ enum Spells SPELL_FROST_ARMOR = 31256, SPELL_DEATH_AND_DECAY = 31258, SPELL_FROST_NOVA = 31250, - SPELL_ICEBOLT = 31249, + SPELL_ICEBOLT = 31249 }; enum Texts { - SAY_ONDEATH = 0, - SAY_ONSLAY = 1, - SAY_DECAY = 2, - SAY_NOVA = 3, - SAY_ONAGGRO = 4, + SAY_ONDEATH = 0, + SAY_ONSLAY = 1, + SAY_DECAY = 2, + SAY_NOVA = 3, + SAY_ONAGGRO = 4 }; class boss_rage_winterchill : public CreatureScript diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index d5d36722618..1186459218c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -26,7 +26,7 @@ enum Yells SAY_AGGRO = 0, SAY_SLAY = 1, SAY_SPLIT = 2, - SAY_DEATH = 3, + SAY_DEATH = 3 }; enum Spells @@ -79,20 +79,20 @@ class boss_skeram : public CreatureScript void JustSummoned(Creature* creature) { // Shift the boss and images (Get it? *Shift*?) - uint8 Rand; + uint8 rand = 0; if (_flag != 0) { - while (_flag & (1 << Rand)) - Rand = urand(0, 2); - DoCast(me, BlinkSpells[Rand]); - _flag |= (1 << Rand); + while (_flag & (1 << rand)) + rand = urand(0, 2); + DoCast(me, BlinkSpells[rand]); + _flag |= (1 << rand); _flag |= (1 << 7); } - while (_flag & (1 << Rand)) - Rand = urand(0, 2); - creature->CastSpell(creature, BlinkSpells[Rand]); - _flag |= (1 << Rand); + while (_flag & (1 << rand)) + rand = urand(0, 2); + creature->CastSpell(creature, BlinkSpells[rand]); + _flag |= (1 << rand); if (_flag & (1 << 7)) _flag = 0; -- cgit v1.2.3