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/DynamicTree.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/DynamicTree.cpp')
| -rw-r--r-- | src/server/collision/DynamicTree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/DynamicTree.cpp b/src/server/collision/DynamicTree.cpp index f6d85df704a..a88c7573707 100644 --- a/src/server/collision/DynamicTree.cpp +++ b/src/server/collision/DynamicTree.cpp @@ -256,5 +256,5 @@ float DynamicMapTree::getHeight(float x, float y, float z, float maxSearchDist, if (callback.didHit()) return v.z - maxSearchDist; else - return -G3D::inf(); + return -G3D::finf(); } |