fix(ghostobject): Add additional tests in W3DRenderObjectSnapshot::addToScene, W3DGhostObject::removeParentObject for robustness (#1569)

xezon · xezon · commit 98f6cd100f87 · 2025-10-19T11:54:06.000+02:00
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -153,7 +153,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::addToScene(void)
 {
-	if (W3DDisplay::m_3DScene != NULL)
+	if (!m_robj->Is_In_Scene())
 		W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
 }
 
@@ -406,6 +406,8 @@ void W3DGhostObject::removeParentObject(void)
 		return;
 
 	Drawable *draw = m_parentObject->getDrawable();
+	if (!draw)
+		return;
 
 	//After we remove the unfogged object, we also disable
 	//anything that should be hidden inside fog - shadow, particles, etc.
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -157,7 +157,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::addToScene(void)
 {
-	if (W3DDisplay::m_3DScene != NULL)
+	if (!m_robj->Is_In_Scene())
 		W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
 }
 
@@ -410,6 +410,8 @@ void W3DGhostObject::removeParentObject(void)
 		return;
 
 	Drawable *draw = m_parentObject->getDrawable();
+	if (!draw)
+		return;
 
 	//After we remove the unfogged object, we also disable
 	//anything that should be hidden inside fog - shadow, particles, etc.

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass robj, DrawableInfo drawInf`
`153`	`153`	`// ------------------------------------------------------------------------------------------------`
`154`	`154`	`void W3DRenderObjectSnapshot::addToScene(void)`
`155`	`155`	`{`
`156`		`- if (W3DDisplay::m_3DScene != NULL)`
	`156`	`+ if (!m_robj->Is_In_Scene())`
`157`	`157`	`W3DDisplay::m_3DScene->Add_Render_Object(m_robj);`
`158`	`158`	`}`
`159`	`159`
`@@ -406,6 +406,8 @@ void W3DGhostObject::removeParentObject(void)`
`406`	`406`	`return;`
`407`	`407`
`408`	`408`	`Drawable *draw = m_parentObject->getDrawable();`
	`409`	`+ if (!draw)`
	`410`	`+ return;`
`409`	`411`
`410`	`412`	`//After we remove the unfogged object, we also disable`
`411`	`413`	`//anything that should be hidden inside fog - shadow, particles, etc.`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass robj, DrawableInfo drawInf`
`157`	`157`	`// ------------------------------------------------------------------------------------------------`
`158`	`158`	`void W3DRenderObjectSnapshot::addToScene(void)`
`159`	`159`	`{`
`160`		`- if (W3DDisplay::m_3DScene != NULL)`
	`160`	`+ if (!m_robj->Is_In_Scene())`
`161`	`161`	`W3DDisplay::m_3DScene->Add_Render_Object(m_robj);`
`162`	`162`	`}`
`163`	`163`
`@@ -410,6 +410,8 @@ void W3DGhostObject::removeParentObject(void)`
`410`	`410`	`return;`
`411`	`411`
`412`	`412`	`Drawable *draw = m_parentObject->getDrawable();`
	`413`	`+ if (!draw)`
	`414`	`+ return;`
`413`	`415`
`414`	`416`	`//After we remove the unfogged object, we also disable`
`415`	`417`	`//anything that should be hidden inside fog - shadow, particles, etc.`