diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-02-09 20:33:30 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-02-09 20:33:30 +0000 |
| commit | 984e1feadfae97c7616c54f9ac731cc6db4f2e15 (patch) | |
| tree | b49dba486d5a5d7fe1511089d7616e56464da04c /src/server/scripts/Outland | |
| parent | 943c866da97871d382db2f52e965ed38558695b0 (diff) | |
| parent | 985de41421f33178cffd2247ab14369334e801ee (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Server/WorldSocket.cpp
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index cade8f34cde..c9d0ab08e1c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -153,7 +153,7 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (instance) instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); |