Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

5 files changed, 20 insertions, 44 deletions

diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 2f8d5fa2ce4..ac3ef5e59e5 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -342,11 +342,11 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript
             {
                 case AT_BREWFEST_DUROTAR:
                     if (Creature* tapper = player->FindNearestCreature(NPC_TAPPER_SWINDLEKEG, 20.0f))
-                        tapper->AI()->Talk(SAY_WELCOME, player->GetGUID());
+                        tapper->AI()->Talk(SAY_WELCOME, player);
                     break;
                 case AT_BREWFEST_DUN_MOROGH:
                     if (Creature* ipfelkofer = player->FindNearestCreature(NPC_IPFELKOFER_IRONKEG, 20.0f))
-                        ipfelkofer->AI()->Talk(SAY_WELCOME, player->GetGUID());
+                        ipfelkofer->AI()->Talk(SAY_WELCOME, player);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 95f97b1dc84..b629fd06b32 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -65,7 +65,7 @@ public:
         void EnterCombat(Unit* who) OVERRIDE
         {
             if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
-                Talk(SAY_GUARD_SIL_AGGRO, who->GetGUID());
+                Talk(SAY_GUARD_SIL_AGGRO, who);
             if (SpellInfo const* spell = me->reachWithSpellAttack(who))
                 DoCast(who, spell->Id);
         }
@@ -106,7 +106,7 @@ public:
                 return;
 
             // Make sure our attack is ready and we arn't currently casting
-            if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false))
+            if (me->isAttackReady() && !me->IsNonMeleeSpellCast(false))
             {
                 //If we are within range melee the target
                 if (me->IsWithinMeleeRange(me->GetVictim()))
@@ -145,7 +145,7 @@ public:
             else
             {
                 //Only run this code if we arn't already casting
-                if (!me->IsNonMeleeSpellCasted(false))
+                if (!me->IsNonMeleeSpellCast(false))
                 {
                     bool healing = false;
                     SpellInfo const* info = NULL;
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index ed086712ca2..5cc9e68eb9b 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -93,7 +93,7 @@ public:
             if (me->IsWithinMeleeRange(me->GetVictim()))
             {
                 //Make sure our attack is ready and we arn't currently casting
-                if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false))
+                if (me->isAttackReady() && !me->IsNonMeleeSpellCast(false))
                 {
                     bool Healing = false;
                     SpellInfo const* info = NULL;
@@ -124,7 +124,7 @@ public:
             else
             {
                 //Only run this code if we arn't already casting
-                if (!me->IsNonMeleeSpellCasted(false))
+                if (!me->IsNonMeleeSpellCast(false))
                 {
                     bool Healing = false;
                     SpellInfo const* info = NULL;
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index bf742d606f2..08be2595c0e 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -54,8 +54,6 @@ EndScriptData
 #define GOSSIP_TORASTRASZA1     "I would like to see Lord Of Afrasastrasz, in the middle of the temple."
 #define GOSSIP_TORASTRASZA2     "Yes, Please. I would like to return to the ground floor of the temple."
 #define GOSSIP_CRIMSONWING      "<Ride the gryphons to Survey Alcaz Island>"
-#define GOSSIP_THRICESTAR1      "Do you think I could take a ride on one of those flying machines?"
-#define GOSSIP_THRICESTAR2      "Kara, I need to be flown out the Dens of Dying to find Bixie."
 #define GOSSIP_WILLIAMKEILAR1   "Take me to Northpass Tower."
 #define GOSSIP_WILLIAMKEILAR2   "Take me to Eastwall Tower."
 #define GOSSIP_WILLIAMKEILAR3   "Take me to Crown Guard Tower."
@@ -163,13 +161,6 @@ public:
             if (player->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
                 player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25);
             break;
-        case 26602:
-            if (creature->IsTaxi())
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TAXI, GOSSIP_THRICESTAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
-
-            if (player->GetQuestStatus(11692) == QUEST_STATUS_COMPLETE)
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_THRICESTAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 27);
-            break;
         case 17209:
             player->SetTaxiCheater(true);
             player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 28);
@@ -299,21 +290,14 @@ public:
             player->CastSpell(player, 42295, true);
             break;
         case GOSSIP_ACTION_INFO_DEF + 26:
-            player->GetSession()->SendTaxiMenu(creature);
-            break;
-        case GOSSIP_ACTION_INFO_DEF + 27:
-            player->CLOSE_GOSSIP_MENU();
-            player->CastSpell(player, 51446, false);
-            break;
-        case GOSSIP_ACTION_INFO_DEF + 28:
             player->CLOSE_GOSSIP_MENU();
             player->ActivateTaxiPathTo(494);
             break;
-        case GOSSIP_ACTION_INFO_DEF + 29:
+        case GOSSIP_ACTION_INFO_DEF + 27:
             player->CLOSE_GOSSIP_MENU();
             player->ActivateTaxiPathTo(495);
             break;
-        case GOSSIP_ACTION_INFO_DEF + 30:
+        case GOSSIP_ACTION_INFO_DEF + 28:
             player->CLOSE_GOSSIP_MENU();
             player->ActivateTaxiPathTo(496);
             break;
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index d7d18d5d36a..44898d41f38 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -965,14 +965,14 @@ public:
                             {
                                 if (IsHealed && !CanRun && spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    Talk(SAY_THANKS, caster->GetGUID());
+                                    Talk(SAY_THANKS, caster);
                                     CanRun = true;
                                 }
                                 else if (!IsHealed && spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     CasterGUID = caster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    Talk(SAY_HEALED, caster->GetGUID());
+                                    Talk(SAY_HEALED, caster);
                                     IsHealed = true;
                                 }
                             }
@@ -982,14 +982,14 @@ public:
                             {
                                 if (IsHealed && !CanRun && spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    Talk(SAY_THANKS, caster->GetGUID());
+                                    Talk(SAY_THANKS, caster);
                                     CanRun = true;
                                 }
                                 else if (!IsHealed && spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     CasterGUID = caster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    Talk(SAY_HEALED, caster->GetGUID());
+                                    Talk(SAY_HEALED, caster);
                                     IsHealed = true;
                                 }
                             }
@@ -999,14 +999,14 @@ public:
                             {
                                 if (IsHealed && !CanRun && spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    Talk(SAY_THANKS, caster->GetGUID());
+                                    Talk(SAY_THANKS, caster);
                                     CanRun = true;
                                 }
                                 else if (!IsHealed && spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     CasterGUID = caster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    Talk(SAY_HEALED, caster->GetGUID());
+                                    Talk(SAY_HEALED, caster);
                                     IsHealed = true;
                                 }
                             }
@@ -1016,14 +1016,14 @@ public:
                             {
                                 if (IsHealed && !CanRun && spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    Talk(SAY_THANKS, caster->GetGUID());
+                                    Talk(SAY_THANKS, caster);
                                     CanRun = true;
                                 }
                                 else if (!IsHealed && spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     CasterGUID = caster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    Talk(SAY_HEALED, caster->GetGUID());
+                                    Talk(SAY_HEALED, caster);
                                     IsHealed = true;
                                 }
                             }
@@ -1033,14 +1033,14 @@ public:
                             {
                                 if (IsHealed && !CanRun && spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    Talk(SAY_THANKS, caster->GetGUID());
+                                    Talk(SAY_THANKS, caster);
                                     CanRun = true;
                                 }
                                 else if (!IsHealed && spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     CasterGUID = caster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    Talk(SAY_HEALED, caster->GetGUID());
+                                    Talk(SAY_HEALED, caster);
                                     IsHealed = true;
                                 }
                             }
@@ -1070,19 +1070,11 @@ public:
                         switch (me->GetEntry())
                         {
                             case ENTRY_SHAYA:
-                                Talk(SAY_GOODBYE, unit->GetGUID());
-                                break;
                             case ENTRY_ROBERTS:
-                                Talk(SAY_GOODBYE, unit->GetGUID());
-                                break;
                             case ENTRY_DOLF:
-                                Talk(SAY_GOODBYE, unit->GetGUID());
-                                break;
                             case ENTRY_KORJA:
-                                Talk(SAY_GOODBYE, unit->GetGUID());
-                                break;
                             case ENTRY_DG_KEL:
-                                Talk(SAY_GOODBYE, unit->GetGUID());
+                                Talk(SAY_GOODBYE, unit);
                                 break;
                         }