From 31f8c32ed947dfcbfb2c73e4e6aff6ef3dbbb4d5 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 00:45:32 +0200 Subject: Rename `damageEffect` -> `damageReaction` (#2554) * CollisionCheckInfo.damageEffect -> damageReaction * damageEffect -> damageReaction in other structs/temps * DMGEFF -> DMGREAC * EnSkb.lastDamageEffect -> lastDamageReaction * EnTest.lastDamageEffect -> lastDamageReaction * enums: DamageEffect -> DamageReaction * cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction * DMG_ENTRY effect -> reaction * cleanup: GELDB_DMG_ -> GELDB_DMGREAC_ * PEAHAT_DMG_EFF -> PEAHAT_DMGREAC * cleanup: RR_DMG_ -> RR_DMGREAC_ * cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_ * cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction * format * review * _DMGREAC_ -> _DMG_REAC_ * _DMG_REAC_ -> _DMG_REACT_ * format --- src/code/z_collision_check.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/code') diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index dcf07766e..283a9b2fb 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -3027,7 +3027,7 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { */ void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage = 0; - info->damageEffect = 0; + info->damageReaction = 0; info->atHitEffect = 0; info->acHitEffect = 0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; @@ -3108,7 +3108,7 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt } damage = tbl->table[i] & 0xF; - col->actor->colChkInfo.damageEffect = tbl->table[i] >> 4 & 0xF; + col->actor->colChkInfo.damageReaction = tbl->table[i] >> 4 & 0xF; } if (!(col->acFlags & AC_HARD)) { col->actor->colChkInfo.damage += damage; -- cgit v1.2.3