server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #157 from recastnavigation/fix-multiple-buildcontext-definition

Browse Source 
Fix possible compile/link error with multiple BuildContext definitions
This commit is contained in:
Ben Hymers 2016-01-15 00:43:14 +00:00
commit dd02c843a1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DetourTileCache/Source/DetourTileCache.cpp
View File

@ -40,10 +40,10 @@ inline int computeTileHash(int x, int y, const int mask)
} }
struct BuildContext struct NavMeshTileBuildContext
{ {
inline BuildContext(struct dtTileCacheAlloc* a) : layer(0), lcset(0), lmesh(0), alloc(a) {} inline NavMeshTileBuildContext(struct dtTileCacheAlloc* a) : layer(0), lcset(0), lmesh(0), alloc(a) {}
inline ~BuildContext() { purge(); } inline ~NavMeshTileBuildContext() { purge(); }
void purge() void purge()
{ {
dtFreeTileCacheLayer(alloc, layer); dtFreeTileCacheLayer(alloc, layer);
@ -587,7 +587,7 @@ dtStatus dtTileCache::buildNavMeshTile(const dtCompressedTileRef ref, dtNavMesh*
m_talloc->reset(); m_talloc->reset();
BuildContext bc(m_talloc); NavMeshTileBuildContext bc(m_talloc);
const int walkableClimbVx = (int)(m_params.walkableClimb / m_params.ch); const int walkableClimbVx = (int)(m_params.walkableClimb / m_params.ch);
dtStatus status; dtStatus status;