diff options
| author | Praetonus <praetonus@gmail.com> | 2014-05-14 16:42:34 +0200 |
|---|---|---|
| committer | Praetonus <praetonus@gmail.com> | 2014-05-15 21:32:47 +0200 |
| commit | f296095191c7b5c6b10f79c2b1433dc227a462f5 (patch) | |
| tree | 2be2a3ee995851f2212c985c358e96c032a9096d /src/tools | |
| parent | 9d760098a5a1bf5203fce8e3ba7b462a7885ee75 (diff) | |
Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.
-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.
Two minor changes in addition :
-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
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; |
