thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-27 20:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix interactions (#868)

Browse source 
* Fix interactions again

* Peachy's suggestion
This commit is contained in:
Sunk 2025-06-24 16:16:35 -04:00 • committed by GitHub
parent 9acb632b8e
commit 90af8dfb64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/interaction.c
View file

@ -245,10 +245,12 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
} }
// Fast attack // Fast attack
if (!(action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK)) {
if (m->forwardVel <= -26.0f || 26.0f <= m->forwardVel) { if (m->forwardVel <= -26.0f || 26.0f <= m->forwardVel) {
return INT_FAST_ATTACK_OR_SHELL; return INT_FAST_ATTACK_OR_SHELL;
} }
} }
}
// Air actions // Air actions
if (action & ACT_FLAG_AIR) { if (action & ACT_FLAG_AIR) {