diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-10-18 05:54:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-18 23:54:54 +1100 |
| commit | 784c1724ff4b33b8d1cb9079a353f2911f09a208 (patch) | |
| tree | 653b3a521339a3527839ca4a5798ac9a8a34d4e9 /src/code/z_fireobj.c | |
| parent | 001c6f0bff1d3f43c890e329e6f9fd574964bad4 (diff) | |
Sync Colliders Final (#1718)
* ElementDamageInfoAT
* ElementDamageInfoAC
* colMaterial
* elemMaterial
Diffstat (limited to 'src/code/z_fireobj.c')
| -rw-r--r-- | src/code/z_fireobj.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c index 162439a53..c4a4630f9 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -4,7 +4,7 @@ ColliderCylinderInit sFireObjCollisionInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -12,11 +12,11 @@ ColliderCylinderInit sFireObjCollisionInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 67, 0, { 0, 0, 0 } }, @@ -223,13 +223,13 @@ void FireObj_Update(PlayState* play, FireObj* fire, Actor* actor) { FireObj_UpdateStateTransitions(play, fire); if (fire->state == FIRE_STATE_NOT_LIT) { if ((fire->collision.base.acFlags & AC_HIT) && - (fire->collision.elem.acHitElem->toucher.dmgFlags & DMG_FIRE_ARROW)) { + (fire->collision.elem.acHitElem->atDmgInfo.dmgFlags & DMG_FIRE_ARROW)) { FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_GROWING); } } else if ((fire->collision.base.acFlags & AC_HIT) && (arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) { arrow->actor.params = 0; - arrow->collider.elem.toucher.dmgFlags = DMG_FIRE_ARROW; + arrow->collider.elem.atDmgInfo.dmgFlags = DMG_FIRE_ARROW; } fire->collision.dim.pos.x = fire->position.x; fire->collision.dim.pos.y = fire->position.y; |