Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Update to Mangos 7136.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-21 16:18:57 -06:00
parent 68c0bcd069
commit 4230318f96
57 changed files with 400 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/ObjectMgr.cpp
View File

@@ -4864,7 +4864,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
sLog.outString( ">> Loaded %u areatrigger scripts", count );
}
uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid )
uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, uint32 team )
{
bool found = false;
float dist;
@@ -4873,7 +4873,7 @@ uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid )
for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
{
TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i);
if(node && node->map_id == mapid)
if(node && node->map_id == mapid && node->MountCreatureID[team == ALLIANCE ? 1 : 0])
{
float dist2 = (node->x - x)*(node->x - x)+(node->y - y)*(node->y - y)+(node->z - z)*(node->z - z);
if(found)