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

Read data from memory buffer instead of loading it from disk

Browse Source 
Safe resources and potential failures.
This commit is contained in:
Kawe Mazidjatari 2023-08-29 00:33:12 +02:00
parent f081fe6f67
commit a9b1d950e5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
r5dev/game/server/ai_networkmanager.cpp
View File

@ -423,20 +423,17 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pManager, CUtlBuff
nNavMeshHash = crc32::update(NULL, pBuf.get(), nLen);
}
FileHandle_t pAIGraph = FileSystem()->Open(szGraphPath, "rb", "GAME");
if (!pAIGraph)
{
Error(eDLL_T::SERVER, NO_ERROR, "%s - Unable to open '%s' (insufficient rights?)\n", __FUNCTION__, szGraphPath);
LoadNetworkGraphEx(pManager, pBuffer, szAIGraphFile);
const ssize_t nFileSize = pBuffer->TellPut();
const ssize_t nOldOffset = pBuffer->TellGet();
return;
}
// Seek to the start of the buffer so we can validate the header.
pBuffer->SeekGet(CUtlBuffer::SEEK_HEAD, 0);
if (FileSystem()->Size(pAIGraph) >= AINET_HEADER_SIZE)
if (nFileSize >= AINET_HEADER_SIZE)
{
FileSystem()->Read(&nAiNetVersion, sizeof(int), pAIGraph);
FileSystem()->Read(&nAiMapVersion, sizeof(int), pAIGraph);
FileSystem()->Read(&nAiGraphHash, sizeof(int), pAIGraph);
nAiNetVersion = pBuffer->GetInt();
nAiMapVersion = pBuffer->GetInt();
nAiGraphHash = pBuffer->GetInt();
if (nAiNetVersion > AINET_VERSION_NUMBER)
{
@ -459,7 +456,8 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pManager, CUtlBuff
Error(eDLL_T::SERVER, NO_ERROR, "%s - AI node graph '%s' is corrupt\n", __FUNCTION__, szGraphPath);
}
FileSystem()->Close(pAIGraph);
// Recover old buffer position before we call LoadNetworkGraph.
pBuffer->SeekGet(CUtlBuffer::SEEK_HEAD, nOldOffset);
LoadNetworkGraphEx(pManager, pBuffer, szAIGraphFile);
}