diff options
| author | megamage <none@none> | 2009-01-21 16:18:57 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-21 16:18:57 -0600 |
| commit | 4230318f962f5faeddf188d61a367a635a8bb81a (patch) | |
| tree | 6827d5a40216a2915c3d7724706c3121e237d51f /src/game/ObjectMgr.cpp | |
| parent | 68c0bcd06980cbc5babc842d990d1b8eb564e388 (diff) | |
*Update to Mangos 7136.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 03165ff51e7..ba74bd3b762 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -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) |