diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
| commit | 547115476f363096483197863e8bbc24064a99ef (patch) | |
| tree | 847450158d5fd445326d41115f551d7bb15e356d /src/server/collision/Management/VMapManager2.cpp | |
| parent | 4a29c73403c4dc713a8a31cb96289adff2b910c1 (diff) | |
| parent | 2a36d2bf5b7f14284a499a14f476c4633b1fc0eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_warrior.cpp
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 1d267cbd2a5..484fdcd8ea4 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -194,7 +194,7 @@ namespace VMAP { Vector3 pos = convertPositionToInternalRep(x, y, z); float height = instanceTree->second->getHeight(pos, maxSearchDist); - if (!(height < G3D::inf())) + if (!(height < G3D::finf())) return height = VMAP_INVALID_HEIGHT_VALUE; // No height return height; |