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

Make PVP hitboxes a little more small

Browse source
This commit is contained in:
Agent X 2023-12-16 10:06:58 -05:00
parent 237753e63b
commit ec876b2017
2 changed files with 2 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

@ -209,7 +209,7 @@ static u32 determine_interaction_internal(struct MarioState *m, struct Object *o
interaction = INT_KICK; interaction = INT_KICK;
} }
} }
if (m->flags & MARIO_TRIPPING) { if (m->flags & MARIO_TRIPPING && gCoopCompatibility) {
// 180 degrees total, or 90 each way // 180 degrees total, or 90 each way
if (-0x4000 <= dYawToObject && dYawToObject <= 0x4000) { if (-0x4000 <= dYawToObject && dYawToObject <= 0x4000) {
interaction = INT_TRIP; interaction = INT_TRIP;

2
src/game/object_collision.c
View file

@ -39,7 +39,7 @@ int detect_player_hitbox_overlap(struct MarioState* local, struct MarioState* re
f32 dx = aTorso[0] - bTorso[0]; f32 dx = aTorso[0] - bTorso[0];
UNUSED f32 sp30 = sp3C - sp38; UNUSED f32 sp30 = sp3C - sp38;
f32 dz = aTorso[2] - bTorso[2]; f32 dz = aTorso[2] - bTorso[2];
f32 collisionRadius = (a->hitboxRadius + b->hitboxRadius) * (gCoopCompatibility ? 2.25f : 1.75f); // 1.5f before f32 collisionRadius = (a->hitboxRadius + b->hitboxRadius) * (gCoopCompatibility ? 2.25f : 1.6f); // 1.5f before
f32 distance = sqrtf(dx * dx + dz * dz); f32 distance = sqrtf(dx * dx + dz * dz);
if (collisionRadius * scale > distance) { if (collisionRadius * scale > distance) {