Little fix to finally properly make attachable scripts only run when they're supposed to. Was trying to avoid adding another member variable to MO but there seems to be no other way, oh well.

Author: garethyr

Entities/Attachable.cpp

@@ -274,7 +274,7 @@ void Attachable::Attach(MOSRotating *pParent)
     // Reset the attachables timers so things that have been sitting in inventory don't make backed up emissions
     ResetAllTimers();
 
-    if (m_pParent != NULL && m_pParent->GetID() != 255) {
+    if (m_pParent != NULL && GetRootParent()->HasEverBeenAddedToMovableMan()) {
         RunScriptedFunctionInAppropriateScripts("OnAttach", false, false, {m_pParent});
     }
 }
@@ -306,7 +306,7 @@ void Attachable::Detach()
 
     m_RestTimer.Reset();
 
-    if (temporaryParent != NULL && temporaryParent->GetID() != 255) {
+    if (temporaryParent != NULL && temporaryParent->GetRootParent()->HasEverBeenAddedToMovableMan()) {
         RunScriptedFunctionInAppropriateScripts("OnDetach", false, false, {temporaryParent});
     }
 }
@@ -554,7 +554,7 @@ void Attachable::Update()
     MOSRotating::Update();
 
     // If we're attached to something, MoveableMan doesn't own us, and therefore isn't calling our ScriptUpdate (and our parent isn't calling it either), so we should here
-    if (m_pParent != NULL && m_pParent->GetID() != 255) { UpdateScripts(); }
+    if (m_pParent != NULL && GetRootParent()->HasEverBeenAddedToMovableMan()) { UpdateScripts(); }
 }
 
 

Entities/MovableObject.cpp

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

Entities/MovableObject.h

@@ -515,6 +515,12 @@ ENTITYALLOCATION(MovableObject)
 
     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.
+    /// </summary>
+    /// <returns></returns>
+    bool HasEverBeenAddedToMovableMan() const { return m_HasEverBeenAddedToMovableMan; }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetSharpness
@@ -833,6 +839,11 @@ ENTITYALLOCATION(MovableObject)
 
     virtual void SetID(const MOID newID) { m_MOID = newID; }
 
+    /// <summary>
+    /// Sets this object as having been added to MovableMan. Should only really be done in MovableMan::AddObject.
+    /// </summary>
+    virtual void SetAsAddedToMovableMan() { m_HasEverBeenAddedToMovableMan = true; }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  SetSharpness
@@ -1917,6 +1928,8 @@ ENTITYALLOCATION(MovableObject)
     // 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.
+    bool m_HasEverBeenAddedToMovableMan;
     // A set of ID:s of MO:s that already have collided with this MO during this frame.
     std::set<MOID> m_AlreadyHitBy;
     // A counter to count the oscillations in translational velocity, in order to detect settling.

Managers/MovableMan.cpp

@@ -797,6 +797,8 @@ bool MovableMan::AddMO(MovableObject *pMOToAdd)
     if (!pMOToAdd)
         return false;
 
+    pMOToAdd->SetAsAddedToMovableMan();
+
     // Find out what kind it is and apply accordingly
     if (Actor *pActor = dynamic_cast<Actor *>(pMOToAdd))
     {
@@ -840,6 +842,7 @@ void MovableMan::AddActor(Actor *pActorToAdd)
 //        pActorToAdd->SetPrevPos(pActorToAdd->GetPos());
 //        pActorToAdd->Update();
 //        pActorToAdd->PostTravel();
+        pActorToAdd->SetAsAddedToMovableMan();
 
         // Filter out stupid fast objects
         if (pActorToAdd->IsTooFast())
@@ -876,6 +879,7 @@ void MovableMan::AddItem(MovableObject *pItemToAdd)
 //        pItemToAdd->SetPrevPos(pItemToAdd->GetPos());
 //        pItemToAdd->Update();
 //        pItemToAdd->PostTravel();
+        pItemToAdd->SetAsAddedToMovableMan();
 
         // Filter out stupid fast objects
         if (pItemToAdd->IsTooFast())
@@ -913,6 +917,7 @@ void MovableMan::AddParticle(MovableObject *pMOToAdd)
 //        pMOToAdd->Update();
 //        pMOToAdd->Travel();
 //        pMOToAdd->PostTravel();
+        pMOToAdd->SetAsAddedToMovableMan();
 
         // Filter out stupid fast objects
         if (pMOToAdd->IsTooFast())