diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
| commit | 676c7341d69bc93e95f147608635655fd91c79b9 (patch) | |
| tree | 934a1bae2a8c791aad0bde4fe4acd04ecc7e2bf4 /src/tools/mmaps_generator | |
| parent | 83066a200202d7a487d11389e73173c1db0c391e (diff) | |
| parent | 718fc5bfc94bdfa8c94a5ed646f31305ab2b08bd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
Diffstat (limited to 'src/tools/mmaps_generator')
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index d4192571454..9dfdf95643d 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -518,8 +518,8 @@ namespace MMAP config.walkableRadius = m_bigBaseUnit ? 1 : 2; config.borderSize = config.walkableRadius + 3; config.maxEdgeLen = VERTEX_PER_TILE + 1; // anything bigger than tileSize - config.walkableHeight = m_bigBaseUnit ? 2 : 4; - config.walkableClimb = m_bigBaseUnit ? 1 : 2; // keep less than walkableHeight + config.walkableHeight = m_bigBaseUnit ? 3 : 6; + config.walkableClimb = m_bigBaseUnit ? 2 : 4; // keep less than walkableHeight config.minRegionArea = rcSqr(60); config.mergeRegionArea = rcSqr(50); config.maxSimplificationError = 1.8f; // eliminates most jagged edges (tiny polygons) |