Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Collision: Fixed false positive errors in console about vmap loading

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/7a406db50626ba9e9a64c8c3d9b6e5b7310ac527)
This commit is contained in:
hondacrx
2020-12-13 17:33:31 -05:00
parent 4c2106781a
commit 923786c12c
4 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Collision/Management/VMapManager.cs
+15 -7
View File
@@ -35,7 +35,7 @@ namespace Game.Collision
Success,
FileNotFound,
VersionMismatch,
InvalidFile
ReadFromFileFailed
}
public class VMapManager : Singleton<VMapManager>
@@ -56,13 +56,20 @@ namespace Game.Collision
var result = VMAPLoadResult.Ignored;
if (IsMapLoadingEnabled())
{
if (LoadSingleMap(mapId, x, y))
LoadResult parentLoadResult = LoadSingleMap(mapId, x, y);
if (parentLoadResult == LoadResult.Success || parentLoadResult == LoadResult.FileNotFound)
{
result = VMAPLoadResult.OK;
if (parentLoadResult == LoadResult.Success)
result = VMAPLoadResult.OK;
// else VMAP_LOAD_RESULT_IGNORED
var childMaps = iChildMapData.LookupByKey(mapId);
foreach (uint childMapId in childMaps)
if (!LoadSingleMap(childMapId, x, y))
{
LoadResult childLoadResult = LoadSingleMap(childMapId, x, y);
if (childLoadResult != LoadResult.Success && childLoadResult != LoadResult.FileNotFound)
result = VMAPLoadResult.Error;
}
}
else
result = VMAPLoadResult.Error;
@@ -71,15 +78,16 @@ namespace Game.Collision
return result;
}
bool LoadSingleMap(uint mapId, uint tileX, uint tileY)
LoadResult LoadSingleMap(uint mapId, uint tileX, uint tileY)
{
var instanceTree = iInstanceMapTrees.LookupByKey(mapId);
if (instanceTree == null)
{
string filename = VMapPath + GetMapFileName(mapId);
StaticMapTree newTree = new StaticMapTree(mapId);
if (!newTree.InitMap(filename))
return false;
LoadResult treeInitResult = newTree.InitMap(filename);
if (treeInitResult != LoadResult.Success)
return treeInitResult;
iInstanceMapTrees.Add(mapId, newTree);