Skip to content

Commit 6ec5806

Browse files
committed
fix weaponBonus not being removed on exit in OpenContain
1 parent d1dc3b4 commit 6ec5806

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ OpenContainModuleData::OpenContainModuleData( void )
8080
m_allowAlliesInside = TRUE;
8181
m_allowEnemiesInside = TRUE;
8282
m_allowNeutralInside = TRUE;
83+
m_passengerWeaponBonusVec.clear();
8384
}
8485

8586
// ------------------------------------------------------------------------------------------------
@@ -796,6 +797,11 @@ void OpenContain::onRemoving( Object *rider)
796797
AudioEventRTS fallingSound = *rider->getTemplate()->getSoundFalling();
797798
fallingSound.setObjectID(rider->getID());
798799
TheAudio->addAudioEvent(&fallingSound);
800+
801+
const OpenContainModuleData* d = getOpenContainModuleData();
802+
for (Int i = 0; i < d->m_passengerWeaponBonusVec.size(); i++) {
803+
rider->clearWeaponBonusCondition(d->m_passengerWeaponBonusVec[i]);
804+
}
799805
}
800806
}
801807

0 commit comments

Comments
 (0)