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
wants to merge 1 commit 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
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: 7 additions & 0 deletions 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 @@ -3998,7 +3998,14 @@ 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
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
7 changes: 7 additions & 0 deletions 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 @@ -4519,7 +4519,14 @@ 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
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