Skip to content

Fix skirmish AI buildability check passing wrong template (#2407) #2837

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
mohamedelabbas1996 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Fix skirmish AI buildability check passing wrong template (#2407) #2837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,12 @@ void AISkirmishPlayer::processBaseBuilding()
}
continue;
}
if (TheBuildAssistant->canMakeUnit(dozer, bldgPlan)!=CANMAKE_OK) {
// TheSuperHackers @bugfix mohamedelabbas1996 Pass the current build-list

@Skyaero42 Skyaero42 Jun 29, 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.

comment too long, maybe not even needed.
We don't reference to issues in code.

// entry (curPlan) to canMakeUnit, not the accumulated candidate (bldgPlan,
// which is still null here). Using bldgPlan made the buildability check fail
// for entries relying on AutomaticallyBuild=Yes (or the default when the
// field is omitted), so the AI never selected them. Fixes issue #2407.
if (TheBuildAssistant->canMakeUnit(dozer, curPlan)!=CANMAKE_OK) {

@Skyaero42 Skyaero42 Jun 29, 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.

This may cause a mismatch when using an AI in multiplayer. Has this been tested?

If it can cause a mismatch, it needs to be behind RETAIL guards.

@xezon xezon Jun 29, 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.

I would expect that is very likely.

if (info->isBuildable()) {
AsciiString bldgName = info->getTemplateName();
bldgName.concat(" - Dozer unable to build - money or technology missing.");
Expand Down
7 changes: 6 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,12 @@ void AISkirmishPlayer::processBaseBuilding()
}
continue;
}
if (TheBuildAssistant->canMakeUnit(dozer, bldgPlan)!=CANMAKE_OK) {
// TheSuperHackers @bugfix mohamedelabbas1996 Pass the current build-list
// entry (curPlan) to canMakeUnit, not the accumulated candidate (bldgPlan,
// which is still null here). Using bldgPlan made the buildability check fail
// for entries relying on AutomaticallyBuild=Yes (or the default when the
// field is omitted), so the AI never selected them. Fixes issue #2407.
if (TheBuildAssistant->canMakeUnit(dozer, curPlan)!=CANMAKE_OK) {
if (info->isBuildable()) {
AsciiString bldgName = info->getTemplateName();
bldgName.concat(" - Dozer unable to build - money or technology missing.");
Expand Down
Loading