From 8147431b0faf2e5fdbfd3e026120d53937818bc2 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 5 Nov 2022 00:11:17 +0100
Subject: [PATCH] Rename Detour_Free() to Detour_LevelShutdown()

Added the missing call to v_Detour_LevelInit(), which was removed for debugging purposes.
---
 r5dev/game/server/ai_utility.cpp | 8 +++++---
 r5dev/game/server/detour_impl.h  | 2 +-
 r5dev/vstdlib/callback.cpp       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/r5dev/game/server/ai_utility.cpp b/r5dev/game/server/ai_utility.cpp
index 5a8b06a9..75a3d1d9 100644
--- a/r5dev/game/server/ai_utility.cpp
+++ b/r5dev/game/server/ai_utility.cpp
@@ -66,7 +66,7 @@ void Detour_LevelInit()
 //-----------------------------------------------------------------------------
 // Purpose: free's the memory used by all valid NavMesh slots
 //-----------------------------------------------------------------------------
-void Detour_Free()
+void Detour_LevelShutdown()
 {
     for (int i = 0; i < MAX_HULLS; i++)
     {
@@ -80,7 +80,7 @@ void Detour_Free()
 }
 
 //-----------------------------------------------------------------------------
-// Purpose: checks if a NavMesh has failed to load
+// Purpose: checks if the NavMesh has failed to load
 // Output : true if a NavMesh has successfully loaded, false otherwise
 //-----------------------------------------------------------------------------
 bool Detour_IsLoaded()
@@ -109,7 +109,9 @@ bool Detour_IsLoaded()
 void Detour_HotSwap()
 {
     // Free and re-init NavMesh.
-    Detour_Free();
+    Detour_LevelShutdown();
+    v_Detour_LevelInit();
+
     if (!Detour_IsLoaded())
         Error(eDLL_T::SERVER, NOERROR, "%s - Failed to hot swap NavMesh\n", __FUNCTION__);
 }
diff --git a/r5dev/game/server/detour_impl.h b/r5dev/game/server/detour_impl.h
index cc983f5e..73d10643 100644
--- a/r5dev/game/server/detour_impl.h
+++ b/r5dev/game/server/detour_impl.h
@@ -50,7 +50,7 @@ dtNavMesh* GetNavMeshForHull(int hullSize);
 uint32_t GetHullMaskById(int hullId);
 
 void Detour_LevelInit();
-void Detour_Free();
+void Detour_LevelShutdown();
 bool Detour_IsLoaded();
 void Detour_HotSwap();
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 56c7dd86..75283ecb 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -225,7 +225,7 @@ Detour_HotSwap_f
 void Detour_HotSwap_f(const CCommand& args)
 {
 	if (!g_pServer->IsActive())
-		return;
+		return; // Only execute if server is initialized and active.
 
 	DevMsg(eDLL_T::SERVER, "Executing NavMesh hot swap for level '%s'\n", 
 		g_ServerGlobalVariables->m_pszMapName);