From b7b7262c7c13c8a7c809543f86459a352153e1d1 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 8 May 2009 19:03:56 -0500
Subject:     [7800] Small fixes for scripting case ActivateTaxiPathTo use:
 Author: VladimirMangos

    * Allow wide mount model lookup in DBC data for script case
    * Allow 0-coordinates node use in script case

--HG--
branch : trunk
---
 src/game/OutdoorPvPEP.cpp | 2 +-
 src/game/Player.cpp       | 8 +++++---
 src/game/SpellAuras.cpp   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp
index f0ff85574c0..fc688314e0c 100644
--- a/src/game/OutdoorPvPEP.cpp
+++ b/src/game/OutdoorPvPEP.cpp
@@ -768,7 +768,7 @@ bool OutdoorPvPObjectiveEP_PWT::HandleGossipOption(Player *plr, uint64 guid, uin
             nodes[1] = dst;
 
             plr->PlayerTalkClass->CloseGossip();
-            plr->ActivateTaxiPathTo(nodes, 0, cr);
+            plr->ActivateTaxiPathTo(nodes, cr);
             // leave the opvp, seems like moveinlineofsight isn't called when entering a taxi
             HandlePlayerLeave(plr);
         }
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 9e27d2d3bec..4e58fa5b885 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17204,8 +17204,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
             return false;
         }
     }
-    // node must have pos if not spell case (npc!=0)
-    else if(!spellid)
+    // node must have pos if taxi master case (npc != NULL)
+    else if (npc)
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
         data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
@@ -17257,8 +17257,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         prevnode = lastnode;
     }
 
-    uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), spellid != 0);
+    // get mount model (in case non taximaster (npc==NULL) allow more wide lookup)
+    uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
 
+    // in spell case allow 0 model
     if (mount_id == 0 && spellid == 0 || sourcepath == 0)
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 3885be1c517..01fc612018d 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -6974,7 +6974,7 @@ void Aura::UnregisterSingleCastAura()
     }
 }
 
-void Aura::HandleAuraSafeFall( bool Apply, bool Real )
+void AuraEffect::HandleAuraSafeFall( bool Apply, bool Real )
 {
     // implemented in WorldSession::HandleMovementOpcodes
 
-- 
cgit v1.2.3