aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp4
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp6
-rw-r--r--src/server/scripts/Kalimdor/dustwallow_marsh.cpp4
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp2
-rwxr-xr-xsrc/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h2
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index fcfecac8685..2a8ba7934e4 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -721,13 +721,13 @@ class debug_commandscript : public CommandScript
return true;
}
- static bool HandleDebugBattlegroundCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleDebugBattlegroundCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
sBattlegroundMgr.ToggleTesting();
return true;
}
- static bool HandleDebugArenaCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleDebugArenaCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
sBattlegroundMgr.ToggleArenaTesting();
return true;
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 5da54bc72fc..86c22807828 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1271,7 +1271,7 @@ class npc_commandscript : public CommandScript
}
//TODO: NpcCommands that needs to be fixed :
- static bool HandleNpcAddWeaponCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleNpcAddWeaponCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
/*if (!*args)
return false;
@@ -1339,7 +1339,7 @@ class npc_commandscript : public CommandScript
return true;
}
- static bool HandleNpcSetNameCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleNpcSetNameCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
/* Temp. disabled
if (!*args)
@@ -1386,7 +1386,7 @@ class npc_commandscript : public CommandScript
return true;
}
- static bool HandleNpcSetSubNameCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleNpcSetSubNameCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
/* Temp. disabled
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index 6c552a4434b..cd119522d51 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -180,7 +180,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();
@@ -278,7 +278,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/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index eebd1ba8cdd..512db1273cc 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -106,7 +106,7 @@ class boss_bronjahm : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
- void DamageTaken(Unit* /*attacker*/, uint32& damage)
+ void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/)
{
if (events.GetPhaseMask() & (1 << PHASE_1) && !HealthAbovePct(30))
{
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 0324e4a28e2..55d788d1a56 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -299,7 +299,7 @@ class player_overlord_brandAI : public PlayerAI
me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID());
}
- void UpdateAI(const uint32 diff) { }
+ void UpdateAI(const uint32 /*diff*/) { }
private:
Creature* tyrannus;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index 82498cd85a9..b551ba0b302 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -202,7 +202,7 @@ class boss_blood_council_controller : public CreatureScript
instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED);
}
- void EnterCombat(Unit* who)
+ void EnterCombat(Unit* /*who*/)
{
instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, IN_PROGRESS);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
index 5878b702e2f..c29ffb00f48 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
@@ -18,7 +18,7 @@
#ifndef DEF_ICECROWN_CITADEL_H
#define DEF_ICECROWN_CITADEL_H
-static const char* ICCScriptName = "instance_icecrown_citadel";
+#define ICCScriptName "instance_icecrown_citadel"
enum eSharedSpells
{
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 820a36f5481..188a859422f 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -499,7 +499,7 @@ class spell_gen_animal_blood : public SpellScriptLoader
return true;
}
- void OnRemove(AuraEffect const* /*aurEff*/, AuraApplication const* aurApp, AuraEffectHandleModes /*mode*/)
+ void OnRemove(AuraEffect const* /*aurEff*/, AuraApplication const* /*aurApp*/, AuraEffectHandleModes /*mode*/)
{
if (GetUnitOwner()->IsInWater())
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_SPAWN_BLOOD_POOL, true);