Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-10 06:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

throw exception if failed to remove/add

Browse source
This commit is contained in:
in0finite 2022-02-20 20:03:36 +01:00
parent 37469d508c
commit 682c181dec
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Assets/Scripts/Behaviours/PathfindingManager.cs
View file

@ -174,7 +174,7 @@ namespace SanAndreasUnity.Behaviours
startData.f = startData.g + CalculateHeuristic(startId, targetId);
SetData(startId, startData);
openList.Add(startId);
AddOrThrow(openList, startId);
while (openList.Count > 0)
{
@ -185,7 +185,7 @@ namespace SanAndreasUnity.Behaviours
return true;
}
openList.Remove(idN); // TODO: throw exception if failed to remove/add
RemoveOrThrow(openList, idN);
closedList.Add(idN);
var nodeN = NodeReader.GetNodeById(idN);
@ -226,7 +226,7 @@ namespace SanAndreasUnity.Behaviours
{
// update
openList.Remove(idM); // first remove with old data
RemoveOrThrow(openList, idM); // first remove with old data
dataM.g = gNew;
dataM.f = fNew;
@ -235,7 +235,7 @@ namespace SanAndreasUnity.Behaviours
SetData(idM, dataM);
openList.Add(idM); // now add with new data
AddOrThrow(openList, idM); // now add with new data
}
}
else
@ -247,7 +247,7 @@ namespace SanAndreasUnity.Behaviours
dataM.parentId = idN;
dataM.hasParent = true;
SetData(idM, dataM);
openList.Add(idM); // do it after setting data
AddOrThrow(openList, idM); // do it after setting data
}
}
@ -344,5 +344,17 @@ namespace SanAndreasUnity.Behaviours
return (PathNodeId)s_itemNodeField.GetValue(minNode); // note: this will allocate memory
}
private static void AddOrThrow(SortedSet<PathNodeId> sortedSet, PathNodeId element)
{
if (!sortedSet.Add(element))
throw new InvalidOperationException("Failed to add element to SortedSet");
}
private static void RemoveOrThrow(SortedSet<PathNodeId> sortedSet, PathNodeId element)
{
if (!sortedSet.Remove(element))
throw new InvalidOperationException("Failed to remove element from SortedSet");
}
}
}