Merge branch 'next' of https://github.com/MegaMech/SpaghettiKart into next

1 files changed, 31 insertions, 0 deletions

diff --git a/src/engine/GarbageCollector.cpp b/src/engine/GarbageCollector.cpp
new file mode 100644
index 000000000..926620fe1
--- /dev/null
+++ b/src/engine/GarbageCollector.cpp
@@ -0,0 +1,31 @@
+#include "GarbageCollector.h"
+#include "World.h"
+
+void RunGarbageCollector() {
+    //CleanActors();
+    CleanObjects();
+}
+
+void CleanActors() {
+    // for (auto actor = gWorldInstance.Actors.begin(); actor != gWorldInstance.Actors.end();) {
+    //     OObject* act = *actor; // Get a mutable copy
+    //     if (act->PendingDestroy) {
+    //         delete act;
+    //         actor = gWorldInstance.Objects.erase(actor); // Remove from container
+    //         continue;
+    //     }
+    //     actor++;
+    // }
+}
+
+void CleanObjects() {
+    for (auto object = gWorldInstance.Objects.begin(); object != gWorldInstance.Objects.end();) {
+        OObject* obj = *object; // Get a mutable copy
+        if (obj->PendingDestroy) {
+            delete obj;
+            object = gWorldInstance.Objects.erase(object); // Remove from container
+            continue;
+        }
+        object++;
+    }
+}
\ No newline at end of file