aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 68545b6a379..19e5c7e02d2 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,true))
+ if(!objmgr.GetTaxiMountDisplayId(GetTaxiSource(),team,true))
return false;
return true;
@@ -17473,10 +17473,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
}
// get mount model (in case non taximaster (npc==NULL) allow more wide lookup)
- uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
+ uint32 mount_display_id = objmgr.GetTaxiMountDisplayId(sourcenode, GetTeam(), npc == NULL);
// in spell case allow 0 model
- if (mount_id == 0 && spellid == 0 || sourcepath == 0)
+ if (mount_display_id == 0 && spellid == 0 || sourcepath == 0)
{
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
@@ -17513,7 +17513,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
sLog.outDebug("WORLD: Sent SMSG_ACTIVATETAXIREPLY");
- GetSession()->SendDoFlight(mount_id, sourcepath);
+ GetSession()->SendDoFlight(mount_display_id, sourcepath);
return true;
}