Skip to content

Fix PoisonedBehavior damage over time to respect poison resistance #1875

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix PoisonedBehavior damage over time to respect poison resistance #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
804f382
Fix PoisonedBehavior damage over time to respect poison resistance
bobtista Nov 17, 2025
b743b0b
put behind CRC retail compat flag
bobtista Nov 17, 2025
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
14 changes: 14 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,15 @@ PoisonedBehavior::~PoisonedBehavior( void )
void PoisonedBehavior::onDamage( DamageInfo *damageInfo )
{
if( damageInfo->in.m_damageType == DAMAGE_POISON )
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 11/17/2025 Ignore damage with INVALID_ID source to prevent infinite loop from DoT
if( damageInfo->in.m_sourceID != INVALID_ID )
startPoisonedEffects( damageInfo );
#else
startPoisonedEffects( damageInfo );
#endif
}
}

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -118,8 +126,14 @@ UpdateSleepTime PoisonedBehavior::update()
// If it is time to do damage, then do it and reset the damage timer
DamageInfo damage;
damage.in.m_amount = m_poisonDamageAmount;
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 11/17/2025 Use INVALID_ID to prevent infinite loop while allowing poison resistance to work
damage.in.m_sourceID = INVALID_ID;
damage.in.m_damageType = DAMAGE_POISON;
#else
damage.in.m_sourceID = m_poisonSource;
damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
#endif
damage.in.m_deathType = m_deathType;
getObject()->attemptDamage( &damage );

Expand Down
15 changes: 15 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,15 @@ PoisonedBehavior::~PoisonedBehavior( void )
void PoisonedBehavior::onDamage( DamageInfo *damageInfo )
{
if( damageInfo->in.m_damageType == DAMAGE_POISON )
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 11/17/2025 Ignore damage with INVALID_ID source to prevent infinite loop from DoT
if( damageInfo->in.m_sourceID != INVALID_ID )
startPoisonedEffects( damageInfo );
#else
startPoisonedEffects( damageInfo );
#endif
}
}

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -118,9 +126,16 @@ UpdateSleepTime PoisonedBehavior::update()
// If it is time to do damage, then do it and reset the damage timer
DamageInfo damage;
damage.in.m_amount = m_poisonDamageAmount;
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 11/17/2025 Use INVALID_ID to prevent infinite loop while allowing poison resistance to work
damage.in.m_sourceID = INVALID_ID;
damage.in.m_damageType = DAMAGE_POISON;
damage.in.m_damageFXOverride = DAMAGE_POISON;
#else
damage.in.m_sourceID = m_poisonSource;
damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
damage.in.m_damageFXOverride = DAMAGE_POISON; // but this will ensure that the right effect is played
#endif
damage.in.m_deathType = m_deathType;
getObject()->attemptDamage( &damage );

Expand Down
Loading