Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented vanish cap players from interacting with other players

This commit is contained in:
MysterD 2020-10-14 20:58:03 -07:00
parent 3028b2c6b2
commit a1d8d73c6d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/interaction.c
View File

@ -1280,6 +1280,15 @@ u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object
if (m2 == NULL) { return FALSE; }
if (m2->action == ACT_JUMBO_STAR_CUTSCENE) { return FALSE; }
// vanish cap players can't interact
u32 vanishFlags = (MARIO_VANISH_CAP | MARIO_CAP_ON_HEAD);
if ((m->flags & vanishFlags) == vanishFlags) {
return FALSE;
}
if ((m2->flags & vanishFlags) == vanishFlags) {
return FALSE;
}
// don't do further interactions if we've hopped on top
if (resolve_player_collision(m, m2)) {
return FALSE;