summaryrefslogtreecommitdiff
path: root/src/enemyUtils.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-31 21:24:07 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-31 21:26:12 -0800
commitdcc596ed8763efd9f71ce9a669cb67a1849d7c2b (patch)
tree108145ce0ee3172e48ac6529d9d49da53e9719b9 /src/enemyUtils.c
parent48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff)
define collisions
Diffstat (limited to 'src/enemyUtils.c')
-rw-r--r--src/enemyUtils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/enemyUtils.c b/src/enemyUtils.c
index ed13377f..35ff738d 100644
--- a/src/enemyUtils.c
+++ b/src/enemyUtils.c
@@ -79,7 +79,7 @@ bool32 EnemyInit(Enemy* this) {
if (super->speed == 0) {
super->speed = definition->speed;
}
- super->flags2 = definition->flags2;
+ super->collisionMask = definition->collisionMask;
super->hitType = definition->damageType;
super->hitbox = (Hitbox*)definition->ptr.hitbox;
super->health = definition->health;
@@ -314,9 +314,9 @@ void EnemyDetachFX(Entity* entity) {
/** Unsets bitfield 0x80 before calling GetNextFunction, so that the enemyFunction 1 is not called. */
void EnemyFunctionHandlerAfterCollision(Entity* entity, void (*const fntable[])()) {
u32 idx;
- entity->contactFlags &= ~CONTACT_TAKE_DAMAGE;
+ entity->contactFlags &= ~CONTACT_NOW;
idx = GetNextFunction(entity);
- entity->contactFlags |= CONTACT_TAKE_DAMAGE;
+ entity->contactFlags |= CONTACT_NOW;
fntable[idx](entity);
}