Skip to content

bugfix: Preserve unit behaviour when transferring assets to allies #1885

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: Preserve unit behaviour when transferring assets to allies #1885

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
b80a653
bugfix: Preserve unit behaviour when transferring assets to allies
Stubbjax Nov 19, 2025
fd969b0
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
10 changes: 9 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3996,9 +3996,17 @@ void Object::removeUpgrade( const UpgradeTemplate *upgradeT )
//-------------------------------------------------------------------------------------------------
void Object::onCapture( Player *oldOwner, Player *newOwner )
{
// Everybody dhills when they captured so they don't keep doing something the new player might not want him to be doing
// Everybody chills when they captured so they don't keep doing something the new player might not want him to be doing
// TheSuperHackers @tweak Stubbjax 19/11/2025 Except when the new owner is an ally, so that Hackers keep on hacking, etc.
if( getAIUpdateInterface() && (oldOwner != newOwner) )
{
#if RETAIL_COMPATIBLE_CRC
getAIUpdateInterface()->aiIdle(CMD_FROM_AI);
#else
if (oldOwner->getRelationship(newOwner->getDefaultTeam()) != ALLIES)
getAIUpdateInterface()->aiIdle(CMD_FROM_AI);
#endif
}

// this gets the new owner some points
newOwner->getScoreKeeper()->addObjectCaptured(this);
Expand Down
10 changes: 9 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4517,9 +4517,17 @@ void Object::removeUpgrade( const UpgradeTemplate *upgradeT )
//-------------------------------------------------------------------------------------------------
void Object::onCapture( Player *oldOwner, Player *newOwner )
{
// Everybody dhills when they captured so they don't keep doing something the new player might not want him to be doing
// Everybody chills when they captured so they don't keep doing something the new player might not want him to be doing
// TheSuperHackers @tweak Stubbjax 19/11/2025 Except when the new owner is an ally, so that Hackers keep on hacking, etc.
if( getAIUpdateInterface() && (oldOwner != newOwner) )
{
#if RETAIL_COMPATIBLE_CRC
getAIUpdateInterface()->aiIdle(CMD_FROM_AI);
#else
if (oldOwner->getRelationship(newOwner->getDefaultTeam()) != ALLIES)
getAIUpdateInterface()->aiIdle(CMD_FROM_AI);
#endif
}

// this gets the new owner some points
newOwner->getScoreKeeper()->addObjectCaptured(this);
Expand Down
Loading