Skip to content

Fix PoisonedBehavior damage-over-time ignoring POISON resistance (#1616) #2987

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

Closed
Nagyhoho1234 wants to merge 2 commits into from
Closed

Fix PoisonedBehavior damage-over-time ignoring POISON resistance (#1616) #2987

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
ffd944f
Fix PoisonedBehavior damage-over-time ignoring POISON resistance (#1616)
Nagyhoho1234 Jul 20, 2026
7a97ad0
Fix stale comment in PoisonedBehavior::update() (#1616 follow-up)
Nagyhoho1234 Jul 20, 2026
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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,10 @@ class PoisonedBehavior : public UpdateModule,
Real m_poisonDamageAmount;
ObjectID m_poisonSource;
DeathType m_deathType;
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Reentrancy guard so our own periodic poison
// damage-over-time tick (see update()) does not re-trigger onDamage() on ourselves now that
// it deals real POISON damage. damage.in.m_sourceID cannot be used for this since it is set
// to the original poisoner (for XP credit), which could legitimately re-poison us again.
Bool m_dealingPeriodicDamage;

};
24 changes: 24 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 @@ -72,6 +72,7 @@ PoisonedBehavior::PoisonedBehavior( Thing *thing, const ModuleData* moduleData )
m_poisonDamageAmount = 0.0f;
m_poisonSource = INVALID_ID;
m_deathType = DEATH_POISONED;
m_dealingPeriodicDamage = FALSE;
setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
}

Expand All @@ -87,7 +88,16 @@ PoisonedBehavior::~PoisonedBehavior()
void PoisonedBehavior::onDamage( DamageInfo *damageInfo )
{
if( damageInfo->in.m_damageType == DAMAGE_POISON )
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Our own periodic poison damage-over-time tick
// (see update()) now deals real POISON damage so that POISON resistance applies to it. Ignore
// it here so it does not re-arm/re-trigger this same PoisonedBehavior instance on ourselves.
if( m_dealingPeriodicDamage )
return;
#endif
startPoisonedEffects( damageInfo );
}
}

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -119,9 +129,23 @@ UpdateSleepTime PoisonedBehavior::update()
DamageInfo damage;
damage.in.m_amount = m_poisonDamageAmount;
damage.in.m_sourceID = m_poisonSource;
#if RETAIL_COMPATIBLE_CRC
damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
#else
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Deal actual POISON damage on the periodic tick
// so the target's POISON resistance (e.g. Chemical Suits) is properly applied. This used to be
// UNRESISTABLE to avoid re-triggering ourselves; onDamage() now guards against that explicitly
// via the m_dealingPeriodicDamage reentrancy flag instead.
damage.in.m_damageType = DAMAGE_POISON;
#endif
damage.in.m_deathType = m_deathType;
#if !RETAIL_COMPATIBLE_CRC
m_dealingPeriodicDamage = TRUE;
#endif
getObject()->attemptDamage( &damage );
#if !RETAIL_COMPATIBLE_CRC
m_dealingPeriodicDamage = FALSE;
#endif

m_poisonDamageFrame = now + d->m_poisonDamageIntervalData;
}
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,10 @@ class PoisonedBehavior : public UpdateModule,
Real m_poisonDamageAmount;
ObjectID m_poisonSource;
DeathType m_deathType;
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Reentrancy guard so our own periodic poison
// damage-over-time tick (see update()) does not re-trigger onDamage() on ourselves now that
// it deals real POISON damage. damage.in.m_sourceID cannot be used for this since it is set
// to the original poisoner (for XP credit), which could legitimately re-poison us again.
Bool m_dealingPeriodicDamage;

};
24 changes: 24 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 @@ -72,6 +72,7 @@ PoisonedBehavior::PoisonedBehavior( Thing *thing, const ModuleData* moduleData )
m_poisonDamageAmount = 0.0f;
m_poisonSource = INVALID_ID;
m_deathType = DEATH_POISONED;
m_dealingPeriodicDamage = FALSE;
setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
}

Expand All @@ -87,7 +88,16 @@ PoisonedBehavior::~PoisonedBehavior()
void PoisonedBehavior::onDamage( DamageInfo *damageInfo )
{
if( damageInfo->in.m_damageType == DAMAGE_POISON )
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Our own periodic poison damage-over-time tick
// (see update()) now deals real POISON damage so that POISON resistance applies to it. Ignore
// it here so it does not re-arm/re-trigger this same PoisonedBehavior instance on ourselves.
if( m_dealingPeriodicDamage )
return;
#endif
startPoisonedEffects( damageInfo );
}
}

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -119,10 +129,24 @@ UpdateSleepTime PoisonedBehavior::update()
DamageInfo damage;
damage.in.m_amount = m_poisonDamageAmount;
damage.in.m_sourceID = m_poisonSource;
#if RETAIL_COMPATIBLE_CRC
damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
#else
// TheSuperHackers @bugfix ZsoltFeher 07/20/2026 Deal actual POISON damage on the periodic tick
// so the target's POISON resistance (e.g. Chemical Suits) is properly applied. This used to be
// UNRESISTABLE to avoid re-triggering ourselves; onDamage() now guards against that explicitly
// via the m_dealingPeriodicDamage reentrancy flag instead.
damage.in.m_damageType = DAMAGE_POISON;
#endif
damage.in.m_damageFXOverride = DAMAGE_POISON; // but this will ensure that the right effect is played
damage.in.m_deathType = m_deathType;
#if !RETAIL_COMPATIBLE_CRC
m_dealingPeriodicDamage = TRUE;
#endif
getObject()->attemptDamage( &damage );
#if !RETAIL_COMPATIBLE_CRC
m_dealingPeriodicDamage = FALSE;
#endif

m_poisonDamageFrame = now + d->m_poisonDamageIntervalData;
}
Expand Down