aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2016-08-17 12:50:43 +0200
committerjackpoz <giacomopoz@gmail.com>2016-08-17 22:00:35 +0200
commit1d7013e0e2758b1468a488dd17e3f5c5ce5f265d (patch)
tree932d622c32574ae4545e415d4078928f1da42169 /src
parenta893ecebf80bd85c4654249406b278e856a805f7 (diff)
Core/MMAPs: Update recast
Update recast to https://github.com/recastnavigation/recastnavigation/commit/64385e9ed0822427bca5814d03a3f4c4d7a6db9f
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Memory.h2
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp2
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 167a6630f0a..fe0e3ffd13d 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -471,7 +471,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;