Skip to content

Commit 58e8a2b

Browse files
authored
bugfix(actionmanager): Allow immediate resumed construction of buildings if the existing builder dies (TheSuperHackers#1872)
1 parent afe79cb commit 58e8a2b

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
482482
// in the future)
483483
//
484484
Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() );
485+
#if RETAIL_COMPATIBLE_CRC
485486
if( builder )
487+
#else
488+
// TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death.
489+
if (builder && !builder->isEffectivelyDead())
490+
#endif
486491
{
487492
AIUpdateInterface *ai = builder->getAI();
488493
DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );

GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
486486
// in the future)
487487
//
488488
Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() );
489+
#if RETAIL_COMPATIBLE_CRC
489490
if( builder )
491+
#else
492+
// TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death.
493+
if (builder && !builder->isEffectivelyDead())
494+
#endif
490495
{
491496
AIUpdateInterface *ai = builder->getAI();
492497
DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );

0 commit comments

Comments
 (0)