Merge pull request #140 from bryanperris/objunlink-sanity-check

Object unlink sanity check
DescentDevelopers · Apr 22, 2024 · a1531bb · a1531bb
2 parents a36797e + ff2cd16
commit a1531bb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Descent3/object.cpp b/Descent3/object.cpp
@@ -1483,6 +1483,11 @@ void ObjUnlink(int objnum) {
 
   ASSERT(objnum != -1);
 
+  // If object is already unlinked, do nothing
+  if (obj->roomnum == -1) {
+    return;
+  }
+
   if (obj->flags & OF_BIG_OBJECT) {
     BigObjRemove(objnum);
   }