R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment

Browse Source
This commit is contained in:
Amos 2022-03-16 01:35:29 +01:00
parent 243c5e4af7
commit 7596f44655
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
r5dev/thirdparty/recast/Detour/Include/DetourNavMesh.h vendored
View File

@ -318,7 +318,6 @@ struct dtMeshTile
dtOffMeshConnection* offMeshCons; ///< The tile off-mesh connections. [Size: dtMeshHeader::offMeshConCount]
unsigned char* data; ///< The tile data. (Not directly accessed under normal situations.)
void* meshLink; ///< Seems shifted with 8 bytes from here (the rest seems to line up with r2) see field assignments in 'r5apex.exe 0x140F44A00'
int dataSize; ///< Size of the tile data.
@ -356,6 +355,7 @@ struct dtNavMeshParams
int reachability_table_count = 0;
};
#pragma pack(push, 4)
/// A navigation mesh based on tiles of convex polygons.
/// @ingroup detour
class dtNavMesh
@ -688,17 +688,18 @@ private:
dtMeshTile** m_posLookup; ///< Tile hash lookup.
dtMeshTile* m_nextFree; ///< Freelist of tiles.
int unk0; ///< Unknown.
dtMeshTile* m_tiles; ///< List of tiles.
int nodePoolIdx; ///< Seems to be the node pool index? "[r5apex_ds.exe + 0xf4bfc0] e.g. 'dtNodePool::getNodeIdx(*&g_pdtNavMesh.unk0, node);'"
#ifndef DT_POLYREF64
unsigned int m_saltBits; ///< Number of salt bits in the tile ID.
unsigned int m_tileBits; ///< Number of tile bits in the tile ID.
unsigned int m_polyBits; ///< Number of poly bits in the tile ID.
int unk1 = -1; ///< Unknown.
#endif
friend class dtNavMeshQuery;
};
#pragma pack(pop)
/// Allocates a navigation mesh object using the Detour allocator.
/// @return A navigation mesh that is ready for initialization, or null on failure.

2
r5dev/thirdparty/recast/Detour/Source/DetourNavMesh.cpp vendored
View File

@ -225,7 +225,7 @@ dtStatus dtNavMesh::init(const dtNavMeshParams* params)
{
memcpy(&m_params, params, sizeof(dtNavMeshParams));
dtVcopy(m_orig, params->orig);
nodePoolIdx = params->orig[1];
unk0 = params->orig[2];
m_tileWidth = params->tileWidth;
m_tileHeight = params->tileHeight;