Skip to content

bugfix(contain): Route Helix attachment experience #3282

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

Draft
tintinhamans wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Draft

bugfix(contain): Route Helix attachment experience #3282

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
8 changes: 7 additions & 1 deletion 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 @@ -39,6 +39,7 @@
#include "Common/ThingFactory.h"
#include "GameClient/ControlBar.h"
#include "GameClient/Drawable.h"
#include "GameLogic/ExperienceTracker.h"
#include "GameLogic/Module/BodyModule.h"
#include "GameLogic/Module/HelixContain.h"
#include "GameLogic/Object.h"
Expand Down Expand Up @@ -272,6 +273,12 @@ void HelixContain::addToContain( Object *obj )
m_portableStructureID = obj->getID();
obj->friend_setContainedBy( getObject() );//fool portable into thinking my object is his container

#if !RETAIL_COMPATIBLE_CRC
// Portable structures bypass onContaining(), so route their kill XP here.
if ( obj->getExperienceTracker() )
obj->getExperienceTracker()->setExperienceSink( getObject()->getID() );
#endif

DEBUG_ASSERTCRASH(getObject() == nullptr || !getObject()->isDestroyed(),
("HelixContain::addToContain - Adding to a destroyed container"));
}
Expand Down Expand Up @@ -401,7 +408,6 @@ void HelixContain::onContaining( Object *obj, Bool wasSelected )
obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_GARRISONED );
obj->setDisabled( DISABLED_HELD );


if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && getObject()->testStatus( OBJECT_STATUS_STEALTHED ) )
{
StealthUpdate *myStealth = obj->getStealth();
Expand Down