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

Fixed small bug in DevMsg log from 'CAI_NetworkManager::LoadNetworkGraph()'

Browse Source 
'(checksum: '0x%X' expected: '0x%X')': checksum was NavMesh, and expected is the nodegraph.
'checksum' should be the nodegraph crc (what we obtain from the AINet header), and expected should be the computed NavMesh crc, since we consider the AIN 'out of date' when its checksum doesn't match the NavMesh one.
This commit is contained in:
Kawe Mazidjatari 2022-08-31 03:00:50 +02:00
parent a5f71dc4d8
commit 8dd7b70d61
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
constexpr int AINET_SCRIPT_VERSION_NUMBER = 21;
constexpr int AINET_VERSION_NUMBER = 57;
constexpr int AINETWORK_MIN_SIZE = 82;
constexpr int AINET_MIN_FILE_SIZE = 82;
/*
==============================
@ -68,7 +68,7 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
if (!pNavMesh)
{
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network.\n", __FUNCTION__, SHULL_SIZE[EHULL_SIZE::LARGE].c_str());
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network\n", __FUNCTION__, SHULL_SIZE[EHULL_SIZE::LARGE].c_str());
}
else
{
@ -345,7 +345,8 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager,
return;
}
if (FileSystem()->Size(pAIGraph) >= AINETWORK_MIN_SIZE)
if (FileSystem()->Size(pAIGraph) >= AINET_MIN_FILE_SIZE)
{
FileSystem()->Read(&nAiNetVersion, sizeof(int), pAIGraph);
FileSystem()->Read(&nAiMapVersion, sizeof(int), pAIGraph);
@ -365,17 +366,17 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager,
{
if (bNavMeshAvailable)
{
if (nNavMeshHash != nAiGraphHash)
if (nAiGraphHash != nNavMeshHash)
{
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);
fsGraphPath.relative_path().u8string().c_str(), nAiGraphHash, nNavMeshHash);
}
}
}
}
else
{
Error(eDLL_T::SERVER, false, "%s - AI node graph '%s' is corrupt (LEN_BYTES < AINETWORK_MIN_SIZE)\n", __FUNCTION__,
Error(eDLL_T::SERVER, false, "%s - AI node graph '%s' is corrupt\n", __FUNCTION__,
fsGraphPath.relative_path().u8string().c_str());
}