mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: elemType -> elemMaterial (#2189)

Browse source 
* elemType -> elemMaterial

* format
This commit is contained in:
Dragorn421 2024-09-17 00:11:01 +02:00 • committed by GitHub
parent 8f0e2fc29c
commit 48780cd2b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
240 changed files with 560 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -33,7 +33,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000080, 0x00, 0x01 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL,
@ -150,7 +150,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
ArmsHook_CheckForCancel(this);
if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) &&
(this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4)) {
(this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4)) {
Actor* touchedActor = this->collider.base.at;
if ((touchedActor->update != NULL) && (touchedActor->flags & (ACTOR_FLAG_9 | ACTOR_FLAG_10))) {