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

[bobtista]

• Fixes Battle bus cannot evac when it's in its immobilized hunk mode when retail compat is off #3040

In non-retail-compatible builds, TransportContain::isSpecificRiderFreeToExit rejects a passenger whenever its container has DISABLED_HELD. An immobilized Battle Bus uses that status for its second-life hulk, so neither evacuate-all nor individual passenger exit requests can remove its occupants.

Now exits are blocked only when the transport is itself contained by another object, preserving the nested-container guard while allowing an immobilized Battle Bus to unload its passengers and begin its empty-hulk destruction delay.

Todo:

• Verify evacuate-all and individual passenger exits from an immobilized Battle Bus with RETAIL_COMPATIBLE_CRC=0
• Replicate to Generals - N/A, Battle Bus is Zero Hour only

[greptile-apps]

Greptile Summary

The PR narrows the held-container exit restriction so immobilized Battle Buses can unload while preserving the guard for transports nested inside another object.

• Replaces the rider-container assertion and broad DISABLED_HELD rejection with a nested-transport condition.
• Applies only to non-retail-compatible Zero Hour builds.

Confidence Score: 5/5

The PR appears safe to merge.

No blocking failure remains.

Important Files Changed

Filename	Overview
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp	Narrows the passenger-exit restriction to held transports that are themselves contained, enabling immobilized Battle Buses to unload as intended.

_{Reviews (2): Last reviewed commit: "bugfix(contain): Allow passengers to exi..." | Re-trigger Greptile}

[xezon]

Is the me->isDisabledByType(DISABLED_HELD) condition still needed then? In what situation would me->getContainedBy() != nullptr be true and me->isDisabledByType(DISABLED_HELD) be false?

[bobtista]

They are equivalent for the normal stock transport-containment paths, but they are distinct engine states: OpenContain/HealContain can contain objects without setting DISABLED_HELD, and scripts can change the flag independently. Keeping both limits this fix to transports that are actually nested and held; the added getContainedBy() check is what distinguishes those from a Battle Bus merely held in place on the terrain.

[xezon]

Is this an LLM generated answer or actually verified to be correct?

[bobtista]

It was LLM generated, and your approach works - updated accordingly

[Stubbjax]

This is part of the problem with taking over another's work without communicating it - you miss the context.

I originally checked for the DISABLED_HELD status as it seemed more comprehensive than simply checking if it was contained, but I missed the fact that Battle Buses become DISABLED_HELD when initially destroyed. I also possibly had my local fix to streamline this behaviour to apply IMMOBILE at the time.

The actual follow-up solution that I had intended was to simply replace this condition with a containment check.

- if (specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
+ if (specificObject->getContainedBy()->isContained())

Can you please verify this is all that is required?