diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-18 19:40:30 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-18 19:40:30 +0200 |
| commit | ef5bc9c70a6b50e1244a91fb922ecab455f6966f (patch) | |
| tree | c018aa80719c1050314e67d9a5a8d5b2e173232a /src/tools | |
| parent | a3793b1741a6ff8cb71c858d12f8de6ca259f338 (diff) | |
| parent | 7228bd3664d9fa6a808e338a2fb2f519a6370672 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 19112d84266..7832cef18de 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -906,7 +906,7 @@ namespace MMAP float p0[3], p1[3]; uint32 mid, tx, ty; float size; - if (sscanf(buf, "%d %d,%d (%f %f %f) (%f %f %f) %f", &mid, &tx, &ty, + if (sscanf(buf, "%u %u,%u (%f %f %f) (%f %f %f) %f", &mid, &tx, &ty, &p0[0], &p0[1], &p0[2], &p1[0], &p1[1], &p1[2], &size) != 10) continue; |