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_player_lib.c | |
| parent | 001c6f0bff1d3f43c890e329e6f9fd574964bad4 (diff) | |
Sync Colliders Final (#1718)
* ElementDamageInfoAT
* ElementDamageInfoAC
* colMaterial
* elemMaterial
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index a81acfc1d..15ba7869a 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -2415,17 +2415,17 @@ s32 func_80126440(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInf return true; } -u8 sPlayerShieldCollisionTypes[PLAYER_SHIELD_MAX] = { - COLTYPE_METAL, // PLAYER_SHIELD_NONE - COLTYPE_METAL, // PLAYER_SHIELD_HEROS_SHIELD - COLTYPE_METAL, // PLAYER_SHIELD_MIRROR_SHIELD +u8 sPlayerShieldColMaterials[PLAYER_SHIELD_MAX] = { + COL_MATERIAL_METAL, // PLAYER_SHIELD_NONE + COL_MATERIAL_METAL, // PLAYER_SHIELD_HEROS_SHIELD + COL_MATERIAL_METAL, // PLAYER_SHIELD_MIRROR_SHIELD }; void Player_UpdateShieldCollider(PlayState* play, Player* player, ColliderQuad* collider, Vec3f quadSrc[4]) { if (player->stateFlags1 & PLAYER_STATE1_400000) { Vec3f quadDest[4]; - player->shieldQuad.base.colType = sPlayerShieldCollisionTypes[player->currentShield]; + player->shieldQuad.base.colMaterial = sPlayerShieldColMaterials[player->currentShield]; Matrix_MultVec3f(&quadSrc[0], &quadDest[0]); Matrix_MultVec3f(&quadSrc[1], &quadDest[1]); Matrix_MultVec3f(&quadSrc[2], &quadDest[2]); |