godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26015 from hedin-hiervard/master 

fixed AStar improper point deletion (leads to crash)
This commit is contained in:
Rémi Verschelde 2019-02-20 18:20:23 +01:00 committed by GitHub
parent 643af210b1 c496781bf6
commit 132e2f458d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/math/a_star.cpp
View File

@ -97,11 +97,14 @@ void AStar::remove_point(int p_id) {
Point *p = points[p_id]; Point *p = points[p_id];
for (Set<Point *>::Element *E = p->neighbours.front(); E; E = E->next()) { Map<int, Point *>::Element *PE = points.front();
while (PE) {
Segment s(p_id, E->get()->id); for (Set<Point *>::Element *E = PE->get()->neighbours.front(); E; E = E->next()) {
segments.erase(s); Segment s(p_id, E->get()->id);
E->get()->neighbours.erase(p); segments.erase(s);
E->get()->neighbours.erase(p);
}
PE = PE->next();
} }
memdelete(p); memdelete(p);