thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-26 03:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make water punches have a range (#557)

Browse source
This commit is contained in:
Sunk 2024-12-12 00:05:36 -05:00 • committed by GitHub
parent 7d0b184fa5
commit 7b8cb0254f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/interaction.c
View file

@ -153,7 +153,11 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
// hack: make water punch actually do something
if (interaction == 0 && m->action == ACT_WATER_PUNCH && o->oInteractType & INTERACT_PLAYER) {
interaction = INT_PUNCH;
s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1];
// 120 degrees total, or 60 each way
if (-0x2AAA <= dYawToObject && dYawToObject <= 0x2AAA) {
interaction = INT_PUNCH;
}
}
if (interaction == 0 && action & ACT_FLAG_ATTACKING) {