Skip to content

bugfix(contain): Allow passengers to exit immobilized Battle Buses #3041

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
bobtista wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −4
Open

bugfix(contain): Allow passengers to exit immobilized Battle Buses #3041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0080a03
bugfix(contain): Allow passengers to exit a container that is held in…
bobtista Aug 1, 2026
dcc2454
bugfix(contain): Block exits from contained transports
bobtista Aug 3, 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
10 changes: 6 additions & 4 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 @@ -579,11 +579,13 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
return FALSE;

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix Stubbjax 02/03/2026 If our parent container is held, then we
// are not free to exit.
DEBUG_ASSERTCRASH(specificObject->getContainedBy(), ("rider must be contained"));
if (specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
// TheSuperHackers @bugfix Stubbjax/bobtista 01/08/2026 Riders are not free to exit when their
// container is contained by another object. A container merely held in place on the terrain,
// eg the battle bus, can still unload passengers.

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

Maybe "e.g. the Battle Bus"

@Stubbjax Stubbjax Aug 8, 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 don't think we even need to adjust the comment from the original as the correct behaviour has no relation to Battle Buses.

if (me->getContainedBy() != nullptr)

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

Can simplify to me->isContained()

{
return FALSE;
}
#endif

// I can always kick people out if I am in the air, I know what I'm doing
Expand Down
Loading