mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-23 15:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename damageEffect -> damageReaction (#2554)

Browse Source 
* 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
This commit is contained in:
Dragorn421
2025-06-04 00:45:32 +02:00
committed by GitHub
parent 0c1b1231d3
commit 31f8c32ed9
61 changed files with 953 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_collision_check.c
+2 -2
View File
@@ -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;