Skip to content

chore(helixcontain): Remove dead code and redundant lookups in HelixContain #3466

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 1 commit into from
Oct 15, 2026
+6 −21
Merged

chore(helixcontain): Remove dead code and redundant lookups in HelixContain #3466

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
27 changes: 6 additions & 21 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ void HelixContain::addToContainList( Object *obj )
{
if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)
{
if ( Object *portable = getPortableStructure() )
TheGameLogic->destroyObject( portable );
Comment thread
xezon marked this conversation as resolved.

m_portableStructureID = obj->getID();
obj->friend_setContainedBy( getObject() );//fool portable into thinking my object is his container

Expand All @@ -267,9 +264,6 @@ void HelixContain::addToContain( Object *obj )
{
if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)
{
if ( Object *portable = getPortableStructure() )
TheGameLogic->destroyObject( portable );

m_portableStructureID = obj->getID();
obj->friend_setContainedBy( getObject() );//fool portable into thinking my object is his container

Expand All @@ -293,21 +287,16 @@ void HelixContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
{
if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && obj->getID() == m_portableStructureID )
{
Object *portable = getPortableStructure();
if ( portable )
{
#if !RETAIL_COMPATIBLE_CRC
portable->friend_setContainedBy(nullptr);
obj->friend_setContainedBy(nullptr);
#endif

#if !(RETAIL_COMPATIBLE_CRC || PRESERVE_NO_XP_FROM_HELIX_ATTACHMENT_KILLS)
if ( portable->getExperienceTracker() )
portable->getExperienceTracker()->setExperienceSink( INVALID_ID );
if ( obj->getExperienceTracker() )
obj->getExperienceTracker()->setExperienceSink( INVALID_ID );
#endif

m_portableStructureID = INVALID_ID;
//portable->kill();
}
m_portableStructureID = INVALID_ID;
}
else
{
Expand Down Expand Up @@ -343,12 +332,8 @@ const Object *HelixContain::friend_getRider() const
//-------------------------------------------------------------------------------------------------
Bool HelixContain::isEnclosingContainerFor( const Object *obj ) const
{
if ( m_portableStructureID == obj->getID() )
{
const Object *portableAsRider = TheGameLogic->findObjectByID( m_portableStructureID );
if ( portableAsRider == obj )
return FALSE;
}
if ( m_portableStructureID != INVALID_ID && m_portableStructureID == obj->getID() )
return FALSE;


return TransportContain::isEnclosingContainerFor( obj );
Expand Down
Loading