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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/engine/objects/Object.h b/src/engine/objects/Object.h
index c41cfae6d..af2df81b5 100644
--- a/src/engine/objects/Object.h
+++ b/src/engine/objects/Object.h
@@ -11,14 +11,16 @@ class OObject {
 public:
     uint8_t uuid[16];
     Object o;
+    bool PendingDestroy = false;
 
     virtual ~OObject() = default;
 
     explicit OObject();
 
     virtual void Tick();
+    virtual void Tick60fps();
     virtual void Draw(s32 cameraId);
     virtual void Collision();
     virtual void Expire();
-    virtual void Destroy();
+    virtual void Destroy(); // Mark object for deletion at the start of the next frame
 };