Skip to content

Commit cd2eef3

Browse files
authored
bugfix(ghostobject): Readd null check for 3DScene in W3DRenderObjectSnapshot::addToScene to prevent crash in headless replay playback (TheSuperHackers#2133)
1 parent 8d60896 commit cd2eef3

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
153153
// ------------------------------------------------------------------------------------------------
154154
Bool W3DRenderObjectSnapshot::addToScene(void)
155155
{
156-
if (!m_robj->Is_In_Scene())
156+
if (W3DDisplay::m_3DScene != nullptr && !m_robj->Is_In_Scene())
157157
{
158158
W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
159159
return true;

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
157157
// ------------------------------------------------------------------------------------------------
158158
Bool W3DRenderObjectSnapshot::addToScene(void)
159159
{
160-
if (!m_robj->Is_In_Scene())
160+
if (W3DDisplay::m_3DScene != nullptr && !m_robj->Is_In_Scene())
161161
{
162162
W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
163163
return true;

0 commit comments

Comments
 (0)