diff options
Diffstat (limited to 'src')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 4d9bd1f2192..dcf70b36df6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -113,7 +113,7 @@ public: for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]); - if (Creature *creature = Unit::GetCreature(*me, *itr)) + if (Creature* creature = Unit::GetCreature(*me, *itr)) { if (!creature->isAlive()) creature->Respawn(); // Let the core handle setting death state, etc. diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 87c28ddd206..22cd971a081 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -37,9 +37,9 @@ EndContentData */ ## npc_calvin_montague ######*/ -enum eCalvin +enum Calvin { - SAY_COMPLETE = -1000431, + SAY_COMPLETE = 0, SPELL_DRINK = 2639, // possibly not correct spell (but iconId is correct) QUEST_590 = 590, FACTION_HOSTILE = 168 @@ -113,15 +113,15 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 const diff) { if (m_uiPhase) { - if (m_uiPhaseTimer <= uiDiff) + if (m_uiPhaseTimer <= diff) m_uiPhaseTimer = 7500; else { - m_uiPhaseTimer -= uiDiff; + m_uiPhaseTimer -= diff; return; } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index dc450a8fea4..e08a9173715 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -860,7 +860,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI* GetAI(Creature* creature) const { return new npc_blessed_bannerAI(creature); } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index b38530b2a4a..5ed799bbec1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2951,7 +2951,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void DoAction(const int32 /*param*/) { |