diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-31 21:28:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 21:28:46 -0800 |
| commit | 983412cc77d81692ad9431c0bd55f8d24e5554f8 (patch) | |
| tree | 108145ce0ee3172e48ac6529d9d49da53e9719b9 /src/object/eyeSwitch.c | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
| parent | dcc596ed8763efd9f71ce9a669cb67a1849d7c2b (diff) | |
Merge pull request #685 from notyourav/col
define collisions
Diffstat (limited to 'src/object/eyeSwitch.c')
| -rw-r--r-- | src/object/eyeSwitch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/eyeSwitch.c b/src/object/eyeSwitch.c index 60310e5c..0e401a64 100644 --- a/src/object/eyeSwitch.c +++ b/src/object/eyeSwitch.c @@ -37,7 +37,7 @@ void EyeSwitch_Init(EyeSwitchEntity* this) { super->collisionFlags = 7; super->hurtType = 0x48; super->hitType = 1; - super->flags2 = 2; + super->collisionMask = 2; super->hitbox = (Hitbox*)&gHitbox_1; if (CheckFlags(this->eyeSwitchFlags)) { super->action = 3; @@ -50,7 +50,7 @@ void EyeSwitch_Init(EyeSwitchEntity* this) { } void EyeSwitch_Action1(EyeSwitchEntity* this) { - if ((super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x15) || super->contactFlags == (CONTACT_TAKE_DAMAGE | 0xe)) && + if ((super->contactFlags == (CONTACT_NOW | 0x15) || super->contactFlags == (CONTACT_NOW | 0xe)) && (DirectionRoundUp(super->contactedEntity->direction) >> 3 == (super->animationState & 3))) { super->action = 2; COLLISION_OFF(super); |