[7797] Use DBC data for mount model selection in more cases. Author: VladimirMangos

    * Use alt.team mount data for take player team model id if DB not provide own team creature id in spell taxi call case.
    * Remove unddeded hacks for model ids from Spell::EffectSendTaxi
    * Provide spell target for SPELL_EFFECT_SEND_TAXI for spell with target mode 0 for this effect.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index c0b2b384938..07b5a71cf83 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -230,7 +230,7 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint
     }
 
     // can't load taxi path without mount set (quest taxi path?)
-    if(!objmgr.GetTaxiMount(GetTaxiSource(),team))
+    if(!objmgr.GetTaxiMount(GetTaxiSource(),team,true))
         return false;
 
     return true;
@@ -17232,8 +17232,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, uint32 mount_i
         prevnode = lastnode;
     }
 
-    if(!mount_id)                                           // if not provide then attempt use default.
-        mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam());
+    if(!mount_id)                                           // if not provide then attempt use default, allow seelct alt team mount creature model but for proper team in spell case.
+        mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
 
     if (mount_id == 0 || sourcepath == 0)
     {