diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-09-12 03:18:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 21:18:46 -0400 |
| commit | f19331101321afb83c0d026c1b1a4df2b4cb4e6a (patch) | |
| tree | 30f258f4d6b9f5c0a7fb30c55b2bfb37849a3c5d /src/code/z_player_lib.c | |
| parent | 64570e871f08e64d2a2fd1e6b8fa32009dc78e88 (diff) | |
Colliders: colType -> colMaterial (#2186)
* colType -> colMaterial
* fixups
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index b5a9a72c1..608423b42 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1312,17 +1312,17 @@ u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo } void Player_UpdateShieldCollider(PlayState* play, Player* this, ColliderQuad* collider, Vec3f* quadSrc) { - static u8 shieldColTypes[PLAYER_SHIELD_MAX] = { - COLTYPE_METAL, - COLTYPE_WOOD, - COLTYPE_METAL, - COLTYPE_METAL, + static u8 shieldColMaterials[PLAYER_SHIELD_MAX] = { + COL_MATERIAL_METAL, + COL_MATERIAL_WOOD, + COL_MATERIAL_METAL, + COL_MATERIAL_METAL, }; if (this->stateFlags1 & PLAYER_STATE1_22) { Vec3f quadDest[4]; - this->shieldQuad.base.colType = shieldColTypes[this->currentShield]; + this->shieldQuad.base.colMaterial = shieldColMaterials[this->currentShield]; Matrix_MultVec3f(&quadSrc[0], &quadDest[0]); Matrix_MultVec3f(&quadSrc[1], &quadDest[1]); |