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

Use CIOStream for reading NavMesh and AIN files

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-08-11 12:09:38 +02:00
parent 88b3336758
commit 52ee409f5f
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,12 +302,13 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager,
uint32_t nAiGraphHash = NULL;
uint32_t nNavMeshHash = NULL;
ifstream iAIGraph(fsGraphPath, fstream::binary);
if (iAIGraph.good())
CIOStream iAIGraph(fsGraphPath, CIOStream::Mode_t::READ);
if (iAIGraph.IsReadable())
{
iAIGraph.read(reinterpret_cast<char*>(&nAiNetVersion), sizeof(int));
iAIGraph.read(reinterpret_cast<char*>(&nAiMapVersion), sizeof(int));
iAIGraph.read(reinterpret_cast<char*>(&nAiGraphHash), sizeof(uint32_t));
iAIGraph.Read(nAiNetVersion);
iAIGraph.Read(nAiMapVersion);
iAIGraph.Read(nAiGraphHash);
if (nAiNetVersion > AINET_VERSION_NUMBER)
{
@ -321,29 +322,18 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager,
}
else
{
ifstream iNavMesh(fsMeshPath, fstream::binary);
if (iNavMesh.good())
CIOStream iNavMesh(fsMeshPath, CIOStream::Mode_t::READ);
if (iNavMesh.IsReadable())
{
vector<uint8_t> uNavMesh;
iNavMesh.seekg(0, fstream::end);
uNavMesh.resize(iNavMesh.tellg());
iNavMesh.seekg(0, fstream::beg);
iNavMesh.read(reinterpret_cast<char*>(uNavMesh.data()), uNavMesh.size());
nNavMeshHash = crc32::update(NULL, uNavMesh.data(), uNavMesh.size());
nNavMeshHash = crc32::update(NULL, iNavMesh.GetData(), iNavMesh.GetSize());
if (nNavMeshHash != nAiGraphHash)
{
Warning(eDLL_T::SERVER, "AI node graph '%s' is out of date (checksum: '0x%X' expected: '0x%X')\n",
fsGraphPath.relative_path().u8string().c_str(), nNavMeshHash, nAiGraphHash);
}
iNavMesh.close();
}
}
iAIGraph.close();
}
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)