thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix custom moveset attacks

Browse source
This commit is contained in:
Isaac0-dev 2025-02-13 20:03:34 +10:00
parent a0ad607b4e
commit 14680f0d25
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/interaction.c
View file

@ -160,7 +160,7 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
} }
} }
if (interaction == 0 && action & ACT_FLAG_ATTACKING) { if ((interaction == 0 || interaction & INT_LUA) && action & ACT_FLAG_ATTACKING) {
u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING); u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING);
if ((action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK) || if ((action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK) ||
((m->flags & flags) && (interaction & INT_LUA))) { ((m->flags & flags) && (interaction & INT_LUA))) {