diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:11:04 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:11:04 +0100 |
| commit | 36b3e06a7e2ffc5bddebd8a749cb0743a841fcaf (patch) | |
| tree | c5c324245d773e6679adca2a933d9791966a8186 /src/server/scripts/Outland | |
| parent | c0b031af4d3e8de03be491156dd13ac78f6770dc (diff) | |
| parent | 73172c67f02b8f2649b762262d54aea7b7f94d07 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 84d292e1fe4..b42641c5171 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -160,7 +160,7 @@ class go_broggok_lever : public GameObjectScript public: go_broggok_lever() : GameObjectScript("go_broggok_lever") {} - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(TYPE_BROGGOK_EVENT) != DONE && instance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index ebc7af26aae..156581e8cd2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -316,7 +316,6 @@ class instance_blood_furnace : public InstanceMapScript if (!prisoner->isAlive()) prisoner->Respawn(true); prisoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE); - prisoner->GetMotionMaster()->MoveTargetedHome(); } void StorePrisoner(Creature* creature) |