aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2012-11-27 12:36:38 +0100
committerVincent-Michael <Vincent_Michael@gmx.de>2012-11-27 12:36:38 +0100
commit8a7ec89883e24741c666577b496fbdfee3582358 (patch)
treed2b7d766637bb78e1aff242086342455f85dc54a /src/server/scripts/EasternKingdoms
parent25f1d6192355760cdbca6f50b247545344b6203e (diff)
Core: Fix warnings
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/tirisfal_glades.cpp10
2 files changed, 6 insertions, 6 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;
}