Skip to content

chore(drawable): Remove obsolete RECOIL_FROM_BEING_DAMAGED code in Drawable::calcPhysicsXformTreads() #3468

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 12, 2026
+0 −62
Merged

chore(drawable): Remove obsolete RECOIL_FROM_BEING_DAMAGED code in Drawable::calcPhysicsXformTreads() #3468

Show file tree
Hide file tree
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
31 changes: 0 additions & 31 deletions Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1822,37 +1822,6 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
m_locoInfo->m_accelerationRollRate += -(LATERAL_ACCEL_COEFF * lateralAccel);
}

#ifdef RECOIL_FROM_BEING_DAMAGED
// recoil from being hit
/// @todo Recoil needs to be based on sane damage amounts (MSB)
const DamageInfo *damageInfo = obj->getBodyModule()->getLastDamageInfo();
if (damageInfo)
{
const UnsignedInt *lastDamageTimestamp = obj->getBodyModule()->getLastDamageTimestamp();
if (lastDamageTimestamp && *lastDamageTimestamp > m_lastDamageTimestamp && damageInfo->in.m_amount > RECOIL_DAMAGE)
{
Object *attacker = TheGameLogic->getObject( damageInfo->in.m_sourceID );
if (attacker)
{
Coord3D to;
ThePartitionManager->getVectorTo( obj, attacker, FROM_CENTER_2D, &to );

to.normalize();

Real forward = dir->x * to.x + dir->y * to.y;
Real lateral = perp.x * to.x + perp.y * to.y;

Real recoil = PI/16.0f * GameClientRandomValueReal( 0.5f, 1.0f );

m_locoInfo->m_accelerationPitchRate -= recoil * forward;
m_locoInfo->m_accelerationRollRate -= recoil * lateral;
}

m_lastDamageTimestamp = *lastDamageTimestamp;
}
}
#endif

// limit recoil pitch and roll

if (m_locoInfo->m_accelerationPitch > DECEL_PITCH_LIMIT)
Expand Down
31 changes: 0 additions & 31 deletions GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,37 +1824,6 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
m_locoInfo->m_accelerationRollRate += -(LATERAL_ACCEL_COEFF * lateralAccel);
}

#ifdef RECOIL_FROM_BEING_DAMAGED
// recoil from being hit
/// @todo Recoil needs to be based on sane damage amounts (MSB)
const DamageInfo *damageInfo = obj->getBodyModule()->getLastDamageInfo();
if (damageInfo)
{
const UnsignedInt *lastDamageTimestamp = obj->getBodyModule()->getLastDamageTimestamp();
if (lastDamageTimestamp && *lastDamageTimestamp > m_lastDamageTimestamp && damageInfo->in.m_amount > RECOIL_DAMAGE)
{
Object *attacker = TheGameLogic->getObject( damageInfo->in.m_sourceID );
if (attacker)
{
Coord3D to;
ThePartitionManager->getVectorTo( obj, attacker, FROM_CENTER_2D, &to );

to.normalize();

Real forward = dir->x * to.x + dir->y * to.y;
Real lateral = perp.x * to.x + perp.y * to.y;

Real recoil = PI/16.0f * GameClientRandomValueReal( 0.5f, 1.0f );

m_locoInfo->m_accelerationPitchRate -= recoil * forward;
m_locoInfo->m_accelerationRollRate -= recoil * lateral;
}

m_lastDamageTimestamp = *lastDamageTimestamp;
}
}
#endif

// limit recoil pitch and roll

if (m_locoInfo->m_accelerationPitch > DECEL_PITCH_LIMIT)
Expand Down
Loading