etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-26 05:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made player-to-player collisions respect the intangible flag

Browse source
This commit is contained in:
MysterD 2023-06-16 17:53:04 -07:00
parent d1bd8f1bfb
commit 9e0e2be194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/interaction.c
View file

@ -1414,7 +1414,7 @@ u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object
if (!m || !o) { return FALSE; } if (!m || !o) { return FALSE; }
if (!is_player_active(m)) { return FALSE; } if (!is_player_active(m)) { return FALSE; }
if (gServerSettings.playerInteractions == PLAYER_INTERACTIONS_NONE) { return FALSE; } if (gServerSettings.playerInteractions == PLAYER_INTERACTIONS_NONE) { return FALSE; }
if (m->action == ACT_JUMBO_STAR_CUTSCENE) { return FALSE; } if (m->action & ACT_FLAG_INTANGIBLE) { return FALSE; }
struct MarioState* m2 = NULL; struct MarioState* m2 = NULL;
for (s32 i = 0; i < MAX_PLAYERS; i++) { for (s32 i = 0; i < MAX_PLAYERS; i++) {
@ -1425,7 +1425,7 @@ u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object
} }
} }
if (m2 == NULL) { return FALSE; } if (m2 == NULL) { return FALSE; }
if (m2->action == ACT_JUMBO_STAR_CUTSCENE) { return FALSE; } if (m2->action & ACT_FLAG_INTANGIBLE) { return FALSE; }
// vanish cap players can't interact // vanish cap players can't interact
u32 vanishFlags = (MARIO_VANISH_CAP | MARIO_CAP_ON_HEAD); u32 vanishFlags = (MARIO_VANISH_CAP | MARIO_CAP_ON_HEAD);