Prevent players from interacting with a shell that someone else is riding

2020-10-14 20:42:04 -07:00 · 2020-10-14 20:42:04 -07:00 · 8fc8ca6ca7
parent cb902c519d
commit 8fc8ca6ca7
1 changed files with 5 additions and 0 deletions
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@ -1708,6 +1708,11 @@ u32 interact_koopa_shell(struct MarioState *m, UNUSED u32 interactType, struct O
        return FALSE;
    }

+    for (int i = 0; i < MAX_PLAYERS; i++) {
+        if (!is_player_active(&gMarioStates[i])) { continue; }
+        if (gMarioStates[i].riddenObj == o) { return FALSE; }
+    }
+
    if (!(m->action & ACT_FLAG_RIDING_SHELL)) {
        u32 interaction = determine_interaction(m, o);