Skip to content

bugfix: Fix issue where builders could resume completed tasks after being disabled #2793

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 8 commits into
base: main
Choose a base branch
from
Open

bugfix: Fix issue where builders could resume completed tasks after being disabled #2793

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a334e41
bugfix: Fix issue where builders could resume completed tasks after b…
Stubbjax Jun 14, 2026
e95478d
bugfix: Only save the previous task for resumption when explicitly di…
Stubbjax Jun 14, 2026
bdf1ab1
refactor: Move fix to the task resumption method
Stubbjax Jun 14, 2026
f72e687
docs: Remove superfluous comments
Stubbjax Jun 14, 2026
a1acd44
refactor: Check construction status bit instead of construction percent
Stubbjax Jun 14, 2026
a4ffdb5
tweak: Still clear previous task if the resumed build fails
Stubbjax Jun 14, 2026
6e1a8be
refactor: Optimise target acquisition
Stubbjax Jun 14, 2026
ede3cb1
fix: Reverse condition
Stubbjax Jun 14, 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
6 changes: 6 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 @@ -2000,7 +2000,13 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
// multiple dozers/workers to double up on construction efforts
//
if( task == DOZER_TASK_BUILD )
{
// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)

@xezon xezon Jun 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Should this perhaps go into DozerAIUpdate::resumePreviousTask and here it should be an assert?

@Stubbjax Stubbjax Jun 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Good point. I suppose it could seeing as this is the only way it can happen. Having to resolve the target from the task info does make the code a bit more complex though.

return;

target->setBuilder( me );
}

m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid = TRUE;
m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location = position;
Expand Down
6 changes: 6 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 @@ -644,7 +644,13 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
// multiple dozers/workers to double up on construction efforts
//
if( task == DOZER_TASK_BUILD )
{
// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
return;

target->setBuilder( me );
}

m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid = TRUE;
m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location = position;
Expand Down
6 changes: 6 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 @@ -2005,7 +2005,13 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
// multiple dozers/workers to double up on construction efforts
//
if( task == DOZER_TASK_BUILD )
{
// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
return;

target->setBuilder( me );
}

m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid = TRUE;
m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location = position;
Expand Down
6 changes: 6 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 @@ -644,7 +644,13 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
// multiple dozers/workers to double up on construction efforts
//
if( task == DOZER_TASK_BUILD )
{
// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
return;

target->setBuilder( me );
}

m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid = TRUE;
m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location = position;
Expand Down
Loading