diff options
| author | jackpoz <giacomopoz@gmail.com> | 2016-08-17 12:50:43 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 15:41:19 +0100 |
| commit | e5ba8f1e4d771a0921b1be0dc1e66a2263b26a44 (patch) | |
| tree | 296d92398e9f0f2bf4d9ba87dd84e20b7a7a2b07 /src | |
| parent | a2acd445fe738ba4b4c8283d13ec8b6029ec9037 (diff) | |
Core/MMAPs: Update recast
Update recast to https://github.com/recastnavigation/recastnavigation/commit/64385e9ed0822427bca5814d03a3f4c4d7a6db9f
(cherry picked from commit 1d7013e0e2758b1468a488dd17e3f5c5ce5f265d)
# Conflicts:
# dep/PackageList.txt
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/shared/Memory.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Memory.h b/src/server/shared/Memory.h index 25533638915..7aeb4dc3f0a 100644 --- a/src/server/shared/Memory.h +++ b/src/server/shared/Memory.h @@ -6,7 +6,7 @@ #include "DetourAlloc.h" // memory management -inline void* dtCustomAlloc(int size, dtAllocHint /*hint*/) +inline void* dtCustomAlloc(size_t size, dtAllocHint /*hint*/) { return (void*)new unsigned char[size]; } diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 7e5af78ef56..3e7c25c8e9a 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -469,7 +469,7 @@ namespace MMAP //if (tileBits < 1) tileBits = 1; // need at least one bit! //int polyBits = sizeof(dtPolyRef)*8 - SALT_MIN_BITS - tileBits; - int polyBits = STATIC_POLY_BITS; + int polyBits = DT_POLY_BITS; int maxTiles = tiles->size(); int maxPolysPerTile = 1 << polyBits; |