Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented bubbled players from interacting with objects

This commit is contained in:
MysterD 2020-10-02 23:37:15 -07:00
parent fb775165ce
commit 931ee9ca13
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/interaction.c
View File

@ -1990,7 +1990,7 @@ void mario_process_interactions(struct MarioState *m) {
sDelayInvincTimer = FALSE; sDelayInvincTimer = FALSE;
sInvulnerable = (m->action & ACT_FLAG_INVULNERABLE) || m->invincTimer != 0; sInvulnerable = (m->action & ACT_FLAG_INVULNERABLE) || m->invincTimer != 0;
if (!(m->action & ACT_FLAG_INTANGIBLE) && m->collidedObjInteractTypes != 0) { if (!(m->action & ACT_FLAG_INTANGIBLE) && m->collidedObjInteractTypes != 0 && is_player_active(m)) {
s32 i; s32 i;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
u32 interactType = sInteractionHandlers[i].interactType; u32 interactType = sInteractionHandlers[i].interactType;