-
Notifications
You must be signed in to change notification settings - Fork 601
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.
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
Name collider fields for "effects" / misc. #1925
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The interesting review bits among all the CtrL+Shift+H noise are:
include/z64actor.h
include/z64collision_check.h
CollisionCheck_SetATvsAC
insrc/code/z_collision_check.c
for theplayer[AT|AC]HitReaction
logicsCylinderInit
inz_obj_bombiwa.c
, andsQuadInit
,sCylinderInit
inz_en_vali.c
, as demonstration forPLAYER_[AC|AT]_HIT_REACTION_
usage (which aren't used in all collider init data everywhere right now)z_player.c
with the only uses ofplayer[AT|AC]HitReaction
8c6a8e3
to
65b4c9b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel like I had things to say back when this was opened. But I procrastinated doing so and have forgotten. Seems fine to me looking it all over again. Sorry for the large delay
due to bss memes this PR conflicts with anything merged to main, I'm not bothering to merge every time but the PR can still be reviewed anyway |
Natural continuation to collider cleanup ( #1427 #1637 ), and some names based on feedback deriving from #1601 (comment)
Names are Best I Could Think Of ™️ , comments and discussion is, as per usual, very welcome!
Collider.colType
/COLTYPE_
->Collider.colMaterial
/COL_MATERIAL_
ColliderElement.elemType
/ELEMTYPE_
->ColliderElement.elemMaterial
/ELEM_MATERIAL_
CollisionCheckInfo.[at|ac]HitEffect
->CollisionCheckInfo.player[AT|AC]HitReaction
ColliderElementDamageInfoAT.effect
toColliderElementDamageInfoAT.playerACHitReaction
and similar with dmgInfoAC/playerATPLAYER_AT_HIT_
,PLAYER_AC_HIT_
enums for these fields' valuesAC
-named constant in "AT" data which is very confusing, but I don't have a better idea at presentColliderElementDamageInfo[AT|AC].dmgFlags
norCollisionCheckInfo.damageEffect
(in contrary to some prior discussion) (because no idea)