mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 12:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: colType -> colMaterial (#2186)

Browse source 
* colType -> colMaterial

* fixups
This commit is contained in:
Dragorn421 2024-09-12 03:18:46 +02:00 • committed by GitHub
parent 64570e871f
commit f193311013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
249 changed files with 448 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/code/z_player_lib.c
View file

@ -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]);