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

Server: fix NavMesh hotswap crash + add codecallbacks

Browse Source 
Fix double destruction (calling delete instead of free, the 'v_Detour_FreeNavMesh' call is the destructor, but we don't have the destructor fully rebuilt yet in the SDK). Also added codecallbacks for scripts.
This commit is contained in:
Kawe Mazidjatari 2024-04-03 14:53:39 +02:00
parent 564efaf394
commit ce64cc57a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
r5dev/game/server/ai_utility.cpp
View File

@ -12,6 +12,8 @@
#include "game/server/detour_impl.h"
#include "game/server/ai_networkmanager.h"
#include "vscript/languages/squirrel_re/vsquirrel.h"
static ConVar navmesh_always_reachable("navmesh_always_reachable", "0", FCVAR_DEVELOPMENTONLY, "Marks goal poly from agent poly as reachable regardless of table data ( !slower! )");
inline uint32_t g_HullMasks[10] = // Hull mask table [r5apex_ds.exe + 131a2f8].
@ -46,7 +48,7 @@ void ClearNavMeshForHull(int hullSize)
// Frees tiles, polys, tris, anything dynamically
// allocated for this navmesh, and the navmesh itself.
v_Detour_FreeNavMesh(nav);
delete nav;
free(nav);
g_pNavMesh[hullSize] = nullptr;
}
@ -129,8 +131,7 @@ bool Detour_IsLoaded()
void Detour_HotSwap()
{
Assert(ThreadInMainOrServerFrameThread());
// TODO: CodeCallback_OnNavMeshHotSwapStart()
g_pServerScript->ExecuteCodeCallback("CodeCallback_OnNavMeshHotSwapBegin");
// Free and re-init NavMesh.
Detour_LevelShutdown();
@ -139,7 +140,7 @@ void Detour_HotSwap()
if (!Detour_IsLoaded())
Error(eDLL_T::SERVER, NOERROR, "%s - Failed to hot swap NavMesh\n", __FUNCTION__);
// TODO: CodeCallback_OnNavMeshHotSwapEnd()
g_pServerScript->ExecuteCodeCallback("CodeCallback_OnNavMeshHotSwapEnd");
}
/*