Added exists in movableman MO flag and used it to re-efficientize movableman::validmo

Author: garethyr

Entities/MovableObject.cpp

@@ -71,6 +71,7 @@ void MovableObject::Clear()
     m_MOID = g_NoMOID;
     m_RootMOID = g_NoMOID;
     m_HasEverBeenAddedToMovableMan = false;
+	m_ExistsInMovableMan = false;
     m_MOIDFootprint = 0;
     m_AlreadyHitBy.clear();
 	m_VelOscillations = 0;

Entities/MovableObject.h

@@ -441,11 +441,17 @@ enum MOType
     int GetMOIDFootprint() const { return m_MOIDFootprint; }
 
     /// <summary>
-    /// Returns whether or not this object has ever been added to MovableMan. Does not account for removal from MovableMan.
+    /// Returns whether or not this MovableObject has ever been added to MovableMan. Does not account for removal from MovableMan.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>Whether or not this MovableObject has ever been added to MovableMan.</returns>
     bool HasEverBeenAddedToMovableMan() const { return m_HasEverBeenAddedToMovableMan; }
 
+	/// <summary>
+	/// Returns whether or not this MovableObject exists in MovableMan, accounting for removal from MovableMan.
+	/// </summary>
+	/// <returns>Whether or not this MovableObject currently exists in MovableMan.</returns>
+	bool ExistsInMovableMan() const { return m_ExistsInMovableMan; }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetSharpness
@@ -774,10 +780,11 @@ enum MOType
     /// </summary>
     virtual void SetAsNoID() { m_MOID = g_NoMOID; }
 
-    /// <summary>
-    /// Sets this object as having been added to MovableMan. Should only really be done in MovableMan::AddObject.
+	/// <summary>
+    /// Sets this MovableObject as having been added to MovableMan. Should only really be done in MovableMan::Add/Remove Actor/Item/Particle.
     /// </summary>
-	void SetAsAddedToMovableMan() { m_HasEverBeenAddedToMovableMan = true; }
+	/// <param name="addedToMovableMan">Whether or not this MovableObject has been added to MovableMan.</param>
+	void SetAsAddedToMovableMan(bool addedToMovableMan = true) { if (addedToMovableMan) { m_HasEverBeenAddedToMovableMan = true; } m_ExistsInMovableMan = addedToMovableMan; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -1927,8 +1934,9 @@ enum MOType
     // How many total (subsequent) MOID's this MO and all its children are taking up this frame.
     // ie if this MO has no children, this will likely be 1.
     int m_MOIDFootprint;
-    // Whether or not this object has been added to MovableMan. Does not take into account the object being removed from MovableMan, though in practice it usually will.
+    // Whether or not this object has ever been added to MovableMan. Does not take into account the object being removed from MovableMan, though in practice it usually will, cause objects are usually only removed when they're deleted.
     bool m_HasEverBeenAddedToMovableMan;
+	bool m_ExistsInMovableMan; //<! Whether or not this object currently exists in MovableMan. Takes into account the object being removed from MovableMan.
     // A set of ID:s of MO:s that already have collided with this MO during this frame.
     std::set<MOID> m_AlreadyHitBy;
 	int m_VelOscillations; //!< A counter for oscillations in translational velocity, in order to detect settling.

Managers/MovableMan.cpp

@@ -927,6 +927,7 @@ bool MovableMan::RemoveActor(MovableObject *pActorToRem)
             }
         }
 		RemoveActorFromTeamRoster(dynamic_cast<Actor *>(pActorToRem));
+		pActorToRem->SetAsAddedToMovableMan(false);
     }
     return removed;
 }
@@ -967,6 +968,7 @@ bool MovableMan::RemoveItem(MovableObject *pItemToRem)
                 }
             }
         }
+		pItemToRem->SetAsAddedToMovableMan(false);
     }
     return removed;
 }
@@ -1082,6 +1084,7 @@ bool MovableMan::RemoveParticle(MovableObject *pMOToRem)
                 }
             }
         }
+		pMOToRem->SetAsAddedToMovableMan(false);
     }
     return removed;
 }
@@ -1111,11 +1114,7 @@ bool MovableMan::ValidateMOIDs() {
 //                  MO that's currently active in the simulation, and kept by this MovableMan.
 
 bool MovableMan::ValidMO(const MovableObject *pMOToCheck) {
-	if (pMOToCheck && pMOToCheck->GetID() != g_NoMOID && pMOToCheck->GetParent() == nullptr) {
-		return true;
-	} else {
-		return IsActor(pMOToCheck) || IsDevice(pMOToCheck) || IsParticle(pMOToCheck);
-	}
+	return pMOToCheck && pMOToCheck->ExistsInMovableMan();
 }