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

Removed header dependency between Detour and Recast due to addition of rcIgnoreUnused. Added dtIgnoreUnused.

Browse Source
This commit is contained in:
grahamboree 2013-10-15 17:29:14 -04:00
parent 683acbb11c
commit dc7e248de6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Detour/Include/DetourCommon.h
View File

@ -32,6 +32,11 @@ feature to find minor members.
/// @name General helper functions /// @name General helper functions
/// @{ /// @{
/// Used to ignore a function parameter. VS complains about unused parameters
/// and this silences the warning.
/// @param [in] _ Unused parameter
template<class T> void dtIgnoreUnused(const T&) { }
/// Swaps the values of the two parameters. /// Swaps the values of the two parameters.
/// @param[in,out] a Value A /// @param[in,out] a Value A
/// @param[in,out] b Value B /// @param[in,out] b Value B

3
DetourTileCache/Source/DetourTileCacheBuilder.cpp
View File

@ -21,7 +21,6 @@
#include "DetourStatus.h" #include "DetourStatus.h"
#include "DetourAssert.h" #include "DetourAssert.h"
#include "DetourTileCacheBuilder.h" #include "DetourTileCacheBuilder.h"
#include "Recast.h"
#include <string.h> #include <string.h>
@ -2117,7 +2116,7 @@ dtStatus dtDecompressTileCacheLayer(dtTileCacheAlloc* alloc, dtTileCacheCompress
bool dtTileCacheHeaderSwapEndian(unsigned char* data, const int dataSize) bool dtTileCacheHeaderSwapEndian(unsigned char* data, const int dataSize)
{ {
rcIgnoreUnused(dataSize); dtIgnoreUnused(dataSize);
dtTileCacheLayerHeader* header = (dtTileCacheLayerHeader*)data; dtTileCacheLayerHeader* header = (dtTileCacheLayerHeader*)data;
int swappedMagic = DT_TILECACHE_MAGIC; int swappedMagic = DT_TILECACHE_MAGIC;