Skip to content

bugfix(ghostobject): Add Ghost Objects of the local player to the scene correctly after loading a savegame #2186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Jan 28, 2026
Merged

bugfix(ghostobject): Add Ghost Objects of the local player to the scene correctly after loading a savegame #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29372ca
bugfix(ghostobject): Add ghost objects to the scene correctly after l…
xezon Jan 25, 2026
4977455
Preserve EA code comment
xezon Jan 27, 2026
17a7022
Replicate in Generals
xezon Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,22 +725,10 @@ void W3DGhostObject::xfer( Xfer *xfer )

// xfer data
xfer->xferSnapshot( objectSnapshot );

// add snapshot to the scene
objectSnapshot->addToScene();
}
}
}

//
// since there is a snapshot for this object, there cannot be a regular object/drawable
// in the world, we need to remove it
//
if( m_parentObject &&
m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] != nullptr &&
xfer->getXferMode() == XFER_LOAD )
removeParentObject();

// count of partition shroudedness info to follow
UnsignedByte shroudednessCount = 0;
UnsignedByte playerIndex;
Expand Down Expand Up @@ -801,6 +789,17 @@ void W3DGhostObject::loadPostProcess( void )
{
// extend base class
GhostObject::loadPostProcess();

const Int playerIndex = TheGhostObjectManager->getLocalPlayerIndex();

// add snapshot to the scene
// TheSuperHackers @bugfix But only for the local player
if (addToScene(playerIndex))
{
// since there is a snapshot for this object, there cannot be a regular object/drawable
// in the world, we need to remove it
removeParentObject();
}
}

// ------------------------------------------------------------------------------------------------
Expand Down
23 changes: 11 additions & 12 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,22 +729,10 @@ void W3DGhostObject::xfer( Xfer *xfer )

// xfer data
xfer->xferSnapshot( objectSnapshot );

// add snapshot to the scene
objectSnapshot->addToScene();
}
}
}

//
// since there is a snapshot for this object, there cannot be a regular object/drawable
// in the world, we need to remove it
//
if( m_parentObject &&
m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] != nullptr &&
xfer->getXferMode() == XFER_LOAD )
removeParentObject();

// count of partition shroudedness info to follow
UnsignedByte shroudednessCount = 0;
UnsignedByte playerIndex;
Expand Down Expand Up @@ -805,6 +793,17 @@ void W3DGhostObject::loadPostProcess( void )
{
// extend base class
GhostObject::loadPostProcess();

const Int playerIndex = TheGhostObjectManager->getLocalPlayerIndex();

// add snapshot to the scene
// TheSuperHackers @bugfix But only for the local player
if (addToScene(playerIndex))
{
// since there is a snapshot for this object, there cannot be a regular object/drawable
// in the world, we need to remove it
removeParentObject();
}
}

// ------------------------------------------------------------------------------------------------
Expand Down
Loading