Skip to content

bugfix: Invalidate current dozer / worker build task if the target scaffold no longer exists #1868

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

Open
Stubbjax wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bugfix: Invalidate current dozer / worker build task if the target scaffold no longer exists #1868

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
b958d86
bugfix: Invalidate current dozer build task if the target scaffold no…
Stubbjax Nov 16, 2025
7e92686
docs: Add comments
Stubbjax Dec 21, 2025
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/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,9 +1596,14 @@ UpdateSleepTime DozerAIUpdate::update( void )
Bool invalidTask = FALSE;

// validate the task and the target
// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
if( currentTask == DOZER_TASK_REPAIR &&
Copy link

@xezon xezon Dec 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

// validate the task and the target
// TheSuperHackers @bugfix Now also invalidates the task when the build scaffold is destroyed

TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
invalidTask = TRUE;
#if !RETAIL_COMPATIBLE_CRC
else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
invalidTask = TRUE;
#endif

// cancel the task if it's now invalid
if( invalidTask == TRUE )
Expand Down
4 changes: 4 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ UpdateSleepTime WorkerAIUpdate::update( void )
if( currentTask == DOZER_TASK_REPAIR &&
TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
invalidTask = TRUE;
#if !RETAIL_COMPATIBLE_CRC
else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
invalidTask = TRUE;
#endif

// cancel the task if it's now invalid
if( invalidTask == TRUE )
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,9 +1601,14 @@ UpdateSleepTime DozerAIUpdate::update( void )
Bool invalidTask = FALSE;

// validate the task and the target
// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
if( currentTask == DOZER_TASK_REPAIR &&
TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
invalidTask = TRUE;
#if !RETAIL_COMPATIBLE_CRC
else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
invalidTask = TRUE;
#endif

// cancel the task if it's now invalid
if( invalidTask == TRUE )
Expand Down
4 changes: 4 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ UpdateSleepTime WorkerAIUpdate::update( void )
if( currentTask == DOZER_TASK_REPAIR &&
TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
invalidTask = TRUE;
#if !RETAIL_COMPATIBLE_CRC
else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
invalidTask = TRUE;
#endif

// cancel the task if it's now invalid
if( invalidTask == TRUE )
Expand Down
Loading