Skip to content

bugfix(contain): Let passengers exit a China Overlord with a Battle Bunker #3668

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
Okladnoj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(contain): Let passengers exit a China Overlord with a Battle Bunker #3668

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
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class OverlordContain : public TransportContain
virtual UnsignedInt getContainCount() const override;
virtual Int getContainMax() const override;
virtual const ContainedItemsList* getContainedItemsList() const override;
virtual Bool isContained( const Object *obj ) const override;

// Friend for our Draw module only.
virtual const Object *friend_getRider() const override; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
Expand Down
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@ const ContainedItemsList* OverlordContain::getContainedItemsList() const
return getRedirectedContain()->getContainedItemsList();
}

//-------------------------------------------------------------------------------------------------
Bool OverlordContain::isContained( const Object *obj ) const
{
if( getRedirectedContain() == nullptr )
return TransportContain::isContained( obj );

return getRedirectedContain()->isContained( obj );
}

//-------------------------------------------------------------------------------------------------
Bool OverlordContain::isEnclosingContainerFor( const Object *obj ) const
{
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class OverlordContain : public TransportContain
virtual UnsignedInt getContainCount() const override;
virtual Int getContainMax() const override;
virtual const ContainedItemsList* getContainedItemsList() const override;
virtual Bool isContained( const Object *obj ) const override;

// Friend for our Draw module only.
virtual const Object *friend_getRider() const override; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,15 @@ const ContainedItemsList* OverlordContain::getContainedItemsList() const
return getRedirectedContain()->getContainedItemsList();
}

//-------------------------------------------------------------------------------------------------
Bool OverlordContain::isContained( const Object *obj ) const
{
if( getRedirectedContain() == nullptr )
return TransportContain::isContained( obj );

return getRedirectedContain()->isContained( obj );
}

//-------------------------------------------------------------------------------------------------
Bool OverlordContain::isEnclosingContainerFor( const Object *obj ) const
{
Expand Down
Loading