Skip to content

bugfix(actionmanager): Allow immediate resumed construction of buildings if the existing builder dies #1872

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 2 commits into from
Jan 28, 2026
Merged

bugfix(actionmanager): Allow immediate resumed construction of buildings if the existing builder dies #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
297e5a1
bugfix: Allow immediate resumed construction of buildings if the exis…
Stubbjax Nov 17, 2025
ebe5bde
docs: Add comments
Stubbjax Jan 23, 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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
// in the future)
//
Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() );
#if RETAIL_COMPATIBLE_CRC
if( builder )
#else
// TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death.
if (builder && !builder->isEffectivelyDead())
#endif
{
AIUpdateInterface *ai = builder->getAI();
DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
// in the future)
//
Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() );
#if RETAIL_COMPATIBLE_CRC
if( builder )
#else
// TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death.
if (builder && !builder->isEffectivelyDead())
#endif
{
AIUpdateInterface *ai = builder->getAI();
DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );
Expand Down
Loading