Snuck in proper handling for scripted function OnCollideWithMO. This actually belongs to CF104, oh well.

garethyr · garethyr · commit aff13392a53a · 2020-05-04T17:21:09.000-03:00
diff --git a/Entities/MovableObject.cpp b/Entities/MovableObject.cpp
@@ -786,8 +786,8 @@ bool MovableObject::IsAtRest()
 
 bool MovableObject::OnMOHit(HitData &hd)
 {
-    if (hd.pBody[HITOR] == this || hd.pBody[HITEE] == this) {
-        RunScriptedFunctionInAppropriateScripts("OnCollideWithMO", false, false, {hd.pBody[hd.pBody[HITOR] == this ? HITEE : HITOR]});
+    if (hd.pRootBody[HITOR] != hd.pRootBody[HITEE] && (hd.pBody[HITOR] == this || hd.pBody[HITEE] == this)) {
+        RunScriptedFunctionInAppropriateScripts("OnCollideWithMO", false, false, {hd.pRootBody[hd.pBody[HITOR] == this ? HITEE : HITOR]});
     }
     return hd.terminate[hd.pRootBody[HITOR] == this ? HITOR : HITEE] = OnMOHit(hd.pRootBody[hd.pRootBody[HITOR] == this ? HITEE : HITOR]);
 }

Original file line number	Diff line number	Diff line change
`@@ -786,8 +786,8 @@ bool MovableObject::IsAtRest()`
`786`	`786`
`787`	`787`	`bool MovableObject::OnMOHit(HitData &hd)`
`788`	`788`	`{`
`789`		`- if (hd.pBody[HITOR] == this \|\| hd.pBody[HITEE] == this) {`
`790`		`- RunScriptedFunctionInAppropriateScripts("OnCollideWithMO", false, false, {hd.pBody[hd.pBody[HITOR] == this ? HITEE : HITOR]});`
	`789`	`+ if (hd.pRootBody[HITOR] != hd.pRootBody[HITEE] && (hd.pBody[HITOR] == this \|\| hd.pBody[HITEE] == this)) {`
	`790`	`+ RunScriptedFunctionInAppropriateScripts("OnCollideWithMO", false, false, {hd.pRootBody[hd.pBody[HITOR] == this ? HITEE : HITOR]});`
`791`	`791`	`}`
`792`	`792`	`return hd.terminate[hd.pRootBody[HITOR] == this ? HITOR : HITEE] = OnMOHit(hd.pRootBody[hd.pRootBody[HITOR] == this ? HITEE : HITOR]);`
`793`	`793`	`}`