From 5486923f4760e5f1dc0732ff69f905a7a3ba8e37 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:22:03 +0200 Subject: [PATCH] Improve CAI_NetworkBuilder::SaveNetworkGraph * Use proper format specifier for short. * Remove redundant IsBadReadPtrV2 call when writing script nodes (this was initially for debugging but hasn't been removed after development finished). --- r5dev/game/server/ai_networkmanager.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/r5dev/game/server/ai_networkmanager.cpp b/r5dev/game/server/ai_networkmanager.cpp index 4697fc61..707a2671 100644 --- a/r5dev/game/server/ai_networkmanager.cpp +++ b/r5dev/game/server/ai_networkmanager.cpp @@ -155,7 +155,7 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork) diskLink.unk0 = pNetwork->m_pAInode[i]->links[j]->unk1; memcpy(diskLink.m_bHulls, pNetwork->m_pAInode[i]->links[j]->m_bHulls, sizeof(diskLink.m_bHulls)); - DevMsg(eDLL_T::SERVER, " |-- Writing link '%d' => '%d' to '0x%zX'\n", diskLink.m_iSrcID, diskLink.m_iDestID, writer.GetPosition()); + DevMsg(eDLL_T::SERVER, " |-- Writing link '%h' => '%h' to '0x%zX'\n", diskLink.m_iSrcID, diskLink.m_iDestID, writer.GetPosition()); writer.Write(&diskLink, sizeof(CAI_NodeLinkDisk)); } } @@ -255,14 +255,7 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork) { // Disk and memory structs for script nodes are identical. DevMsg(eDLL_T::SERVER, " |-- Writing script node '#%d' at '0x%zX'\n", i, writer.GetPosition()); - if (!IsBadReadPtrV2(reinterpret_cast(&pNetwork->m_ScriptNode[i]))) - { - writer.Write(&pNetwork->m_ScriptNode[i], sizeof(CAI_ScriptNode)); - } - else - { - Warning(eDLL_T::SERVER, " |-- Unable to write node '#%d' (invalid pointer)\n", i, pNetwork->m_iNumScriptNodes); - } + writer.Write(&pNetwork->m_ScriptNode[i], sizeof(CAI_ScriptNode)); } timer.End();