aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorShauren <none@none>2010-12-14 16:24:59 +0100
committerShauren <none@none>2010-12-14 16:24:59 +0100
commit314376e32c5e736582a67a3d3cd4471acf37911d (patch)
tree26589d5ac2304bb3babb0fe83d221cbf2fa04ec4 /src/server/scripts/Northrend
parentf4581f67b8cc574d49455ec993858c9de49b0945 (diff)
Scripts: Fixed uninitialized variables, unreferenced parameters and virtual overrides
--HG-- branch : trunk
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp8
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp2
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp10
-rw-r--r--src/server/scripts/Northrend/howling_fjord.cpp4
6 files changed, 15 insertions, 13 deletions
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 158e19843d9..e22a372fd39 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -323,7 +323,7 @@ public:
nWeaver = 0;
}
- void KilledUnit()
+ void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
}
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index 1e0e98fa550..5ac7ef1db8f 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -788,7 +788,7 @@ public:
{
}
- void JustDied()
+ void JustDied(Unit* /*killer*/)
{
float x,y,z;
me->GetPosition(x,y,z);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 9d2a3178bab..07820dc2919 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -436,7 +436,7 @@ public:
void SpawnTrigger()
{
- uint8 iStart,iEnd;
+ uint8 iStart = 0, iEnd = 0;
switch (urand(0,1))
{
case 0:
@@ -447,9 +447,11 @@ public:
iStart = 38;
iEnd = 68;
break;
+ default:
+ break;
}
- for(uint32 i = iStart; i < iEnd; ++i)
- me->SummonCreature(CREATURE_TRIGGER,Location[i]);
+ for (uint32 i = iStart; i < iEnd; ++i)
+ me->SummonCreature(CREATURE_TRIGGER, Location[i]);
}
};
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index ccb24a956ed..609333bd8d3 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -232,7 +232,7 @@ public:
}
// called by svala sorrowgrave to set guid of victim
- void DoAction(uint32 /*action*/)
+ void DoAction(const int32 /*action*/)
{
if (pInstance)
if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)))
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 5c5ea193cce..ce462b96f9e 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -2418,11 +2418,11 @@ public:
me->RestoreFaction();
}
- void DoAction(const int32 iParam)
+ void DoAction(const int32 /*iParam*/)
{
me->StopMoving();
- me->SetUInt32Value(UNIT_NPC_FLAGS,0);
- if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID))
+ me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
+ if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID))
{
me->SetInFront(pPlayer);
me->SendMovementFlagUpdate();
@@ -2431,7 +2431,7 @@ public:
uiEventPhase = 1;
}
- void SetGUID(const uint64 &uiGuid, int32 iId)
+ void SetGUID(const uint64 &uiGuid, int32 /*iId*/)
{
uiPlayerGUID = uiGuid;
}
@@ -2546,7 +2546,7 @@ public:
return true;
}
- bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+ bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
{
pPlayer->PlayerTalkClass->ClearMenus();
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
index 0d4751863d6..67f37135d50 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -419,12 +419,12 @@ public:
me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS);
}
- void SummonedCreatureDies(Creature* pSummoned, Unit* pKiller)
+ void SummonedCreatureDies(Creature* pSummoned, Unit* /*pKiller*/)
{
uint32 uiEntry = 0;
// will eventually reset the event if something goes wrong
- switch(pSummoned->GetEntry())
+ switch (pSummoned->GetEntry())
{
case NPC_FIRJUS: uiEntry = NPC_JLARBORN; break;
case NPC_JLARBORN: uiEntry = NPC_YOROS; break;