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

Remove all elements from monitored_bodies and monitored_areas when processed

This commit is contained in:
Marcel Admiraal 2020-12-26 09:23:13 +00:00
parent 626ca08108
commit 03cddd36db
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics/area_sw.cpp
View File

@ -192,7 +192,9 @@ void AreaSW::call_queries() {
for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) { for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) {
if (E->get().state == 0) { // Nothing happened if (E->get().state == 0) { // Nothing happened
E = E->next(); Map<BodyKey, BodyState>::Element *next = E->next();
monitored_bodies.erase(E);
E = next;
continue; continue;
} }
@ -228,7 +230,9 @@ void AreaSW::call_queries() {
for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) { for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) {
if (E->get().state == 0) { // Nothing happened if (E->get().state == 0) { // Nothing happened
E = E->next(); Map<BodyKey, BodyState>::Element *next = E->next();
monitored_areas.erase(E);
E = next;
continue; continue;
} }

8
servers/physics_2d/area_2d_sw.cpp
View File

@ -192,7 +192,9 @@ void Area2DSW::call_queries() {
for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) { for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) {
if (E->get().state == 0) { // Nothing happened if (E->get().state == 0) { // Nothing happened
E = E->next(); Map<BodyKey, BodyState>::Element *next = E->next();
monitored_bodies.erase(E);
E = next;
continue; continue;
} }
@ -228,7 +230,9 @@ void Area2DSW::call_queries() {
for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) { for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) {
if (E->get().state == 0) { // Nothing happened if (E->get().state == 0) { // Nothing happened
E = E->next(); Map<BodyKey, BodyState>::Element *next = E->next();
monitored_areas.erase(E);
E = next;
continue; continue;
} }