Merge branch 'master' into 4.x and some warning fixes

4 files changed, 53 insertions, 16 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index 1a43472365a..798ea3925dc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -34,7 +34,8 @@ enum Spells
     H_SPELL_MIND_BLAST                          = 58850,
     SPELL_SLEEP                                 = 52721, //Puts an enemy to sleep for up to 10 sec. Any damage caused will awaken the target.
     H_SPELL_SLEEP                               = 58849,
-    SPELL_VAMPIRIC_TOUCH                        = 52723 //Heals the caster for half the damage dealt by a melee attack.
+    SPELL_VAMPIRIC_TOUCH                        = 52723, //Heals the caster for half the damage dealt by a melee attack.
+    SPELL_KILL_CREDIT                           = 58630  // Non-existing spell as encounter credit, created in spell_dbc
 };
 
 enum Yells
@@ -237,9 +238,8 @@ public:
             {
                 instance->SetData(DATA_MAL_GANIS_EVENT, DONE);
 
-                // give achievement credit to players. criteria use spell 58630 which doesn't exist.
-                if (instance)
-                    instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58630);
+                // give achievement credit and LFG rewards to players. criteria use spell 58630 which doesn't exist, but it was created in spell_dbc
+                DoCast(me, SPELL_KILL_CREDIT);
             }
         }
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 1f0342b3804..65ae3287381 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -498,7 +498,7 @@ public:
         }
         void DoUnmount()
         {
-            me->Unmount();
+            me->Dismount();
             me->SetSpeed(MOVE_RUN, SPEED_RUN);
         }
         void EnterCombat(Unit* /*who*/)
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index 71372f1d9e4..5badc7fe725 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -25,6 +25,9 @@ EndScriptData */
 
 /* ContentData
 npc_aged_dying_ancient_kodo
+go_iruxos
+npc_dalinda_malem
+go_demon_portal
 EndContentData */
 
 #include "ScriptPCH.h"
@@ -168,22 +171,28 @@ public:
 };
 
 /*######
-## go_iruxos. Quest 5381
+## go_iruxos
+## Hand of Iruxos
 ######*/
 
+enum 
+{
+    QUEST_HAND_IRUXOS   = 5381,
+    NPC_DEMON_SPIRIT    = 11876,
+};
+
 class go_iruxos : public GameObjectScript
 {
-public:
-    go_iruxos() : GameObjectScript("go_iruxos") { }
+    public:
+        go_iruxos() : GameObjectScript("go_iruxos") { }
 
-    bool OnGossipHello(Player* player, GameObject* /*pGO*/)
-    {
-            if (player->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
-                player->SummonCreature(11876, player->GetInnPosX(), player->GetInnPosY(), player->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
+        bool OnGossipHello(Player* player, GameObject* go)
+        {
+            if (player->GetQuestStatus(QUEST_HAND_IRUXOS) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_SPIRIT, 25.0f, true))
+                player->SummonCreature(NPC_DEMON_SPIRIT, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
 
             return true;
-    }
-
+        }
 };
 
 /*######
@@ -254,7 +263,34 @@ public:
             DoMeleeAttackIfReady();
         }
     };
+};
+
+/*######
+## go_demon_portal
+######*/
 
+enum DemonPortal
+{
+    NPC_DEMON_GUARDIAN          = 11937,
+
+    QUEST_PORTAL_OF_THE_LEGION  = 5581,
+};
+
+class go_demon_portal : public GameObjectScript
+{
+    public:
+        go_demon_portal() : GameObjectScript("go_demon_portal") { }
+
+        bool OnGossipHello(Player* player, GameObject* go)
+        {
+            if (player->GetQuestStatus(QUEST_PORTAL_OF_THE_LEGION) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_GUARDIAN, 5.0f, true))
+            {
+                if (Creature* guardian = player->SummonCreature(NPC_DEMON_GUARDIAN, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    guardian->AI()->AttackStart(player);
+            }
+
+            return true;
+        }
 };
 
 void AddSC_desolace()
@@ -262,4 +298,5 @@ void AddSC_desolace()
     new npc_aged_dying_ancient_kodo();
     new go_iruxos();
     new npc_dalinda();
+    new go_demon_portal();
 }
diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp
index 1f64353901c..d6d2d633890 100644
--- a/src/server/scripts/Kalimdor/durotar.cpp
+++ b/src/server/scripts/Kalimdor/durotar.cpp
@@ -400,7 +400,7 @@ class npc_troll_volunteer : public CreatureScript
                     DoCast(me, SPELL_TURNIN);
                     DoCast(me, SPELL_QUEST_CREDIT);
                     me->RemoveAurasDueToSpell(SPELL_MOUNTING_CHECK);
-                    me->Unmount();
+                    me->Dismount();
                     Talk(SAY_VOLUNTEER_END);
                     me->GetMotionMaster()->MovePoint(POINT_URUZIN, caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ());
                 }
@@ -447,7 +447,7 @@ class spell_mount_check : public SpellScriptLoader
                             target->Mount(mountid);
                 }
                 else if (!owner->IsMounted() && target->IsMounted())
-                    target->Unmount();
+                    target->Dismount();
 
                 target->SetSpeed(MOVE_RUN, owner->GetSpeedRate(MOVE_RUN));
                 target->SetSpeed(MOVE_WALK, owner->GetSpeedRate(MOVE_WALK));