diff options
| author | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
| commit | 0fb8f057974cdf3107084be65005956efb5191dc (patch) | |
| tree | 8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/collision/Management/VMapManager2.cpp | |
| parent | f96e1ce1d7b10074750da761ff9b219a24d0f09f (diff) | |
| parent | 1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index b318b91b29e..5b2d6fafc20 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -161,8 +161,8 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1); + Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); if (pos1 != pos2) { result = instanceTree->second->isInLineOfSight(pos1, pos2); @@ -186,11 +186,11 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1); + Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); Vector3 resultPos; result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, pModifyDist); - resultPos = convertPositionToMangosRep(resultPos.x,resultPos.y,resultPos.z); + resultPos = convertPositionToMangosRep(resultPos.x, resultPos.y, resultPos.z); rx = resultPos.x; ry = resultPos.y; rz = resultPos.z; @@ -212,7 +212,7 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos = convertPositionToInternalRep(x,y,z); + Vector3 pos = convertPositionToInternalRep(x, y, z); height = instanceTree->second->getHeight(pos, maxSearchDist); if (!(height < G3D::inf())) { |