Skip to content

bugfix(actionmanager): Restore retail compatibility after construction cursor change in ActionManager #2125

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 1 commit into from
Jan 16, 2026
Merged

bugfix(actionmanager): Restore retail compatibility after construction cursor change in ActionManager #2125

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
8 changes: 8 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 @@ -455,8 +455,16 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
return FALSE;

// TheSuperHackers @bugfix Stubbjax 06/01/2025 Ensure only the owner of the construction can resume it.
#if RETAIL_COMPATIBLE_CRC
Relationship r = obj->getRelationship(objectBeingConstructed);

// only available to our allies
if( r != ALLIES )
return FALSE;
#else
if (obj->getControllingPlayer() != objectBeingConstructed->getControllingPlayer())
return FALSE;
#endif

// if the objectBeingConstructed is not actually under construction we can't resume that!
if( !objectBeingConstructed->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
Expand Down
8 changes: 8 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 @@ -459,8 +459,16 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
return FALSE;

// TheSuperHackers @bugfix Stubbjax 06/01/2025 Ensure only the owner of the construction can resume it.
#if RETAIL_COMPATIBLE_CRC
Relationship r = obj->getRelationship(objectBeingConstructed);

// only available to our allies
if( r != ALLIES )
return FALSE;
#else
if (obj->getControllingPlayer() != objectBeingConstructed->getControllingPlayer())
return FALSE;
#endif

// if the objectBeingConstructed is not actually under construction we can't resume that!
if( !objectBeingConstructed->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
Expand Down
Loading