Skip to content

bugfix(contain): Preserve occupants when transferring assets to allies #3124

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 2 commits into from
Aug 19, 2026
+12 −0
Merged

bugfix(contain): Preserve occupants when transferring assets to allies #3124

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
87a61ed
bugfix: Preserve occupants when transferring assets to allies
Stubbjax Nov 19, 2025
525bbe9
docs: Add comments
Stubbjax Aug 19, 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/Contain/TransportContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,13 @@ void TransportContain::onCapture( Player *oldOwner, Player *newOwner )
else
{
//Use standard
#if RETAIL_COMPATIBLE_CRC
orderAllPassengersToExit( CMD_FROM_AI );
#else
Comment thread
Skyaero42 marked this conversation as resolved.
// TheSuperHackers @bugfix Stubbjax 20/11/2025 Only eject passengers if the new owner is not allied with the old owner.
if (oldOwner->getRelationship(newOwner->getDefaultTeam()) != ALLIES)
orderAllPassengersToExit(CMD_FROM_AI);
Comment thread
Skyaero42 marked this conversation as resolved.
#endif
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,13 @@ void TransportContain::onCapture( Player *oldOwner, Player *newOwner )
else
{
//Use standard
#if RETAIL_COMPATIBLE_CRC
orderAllPassengersToExit( CMD_FROM_AI, FALSE );
#else
// TheSuperHackers @bugfix Stubbjax 20/11/2025 Only eject passengers if the new owner is not allied with the old owner.
if (oldOwner->getRelationship(newOwner->getDefaultTeam()) != ALLIES)
orderAllPassengersToExit(CMD_FROM_AI, FALSE);
#endif
}
}
}
Expand Down
Loading