mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2026-04-28 04:51:40 +00:00
Fix invincibility
This commit is contained in:
parent
61b8461a59
commit
55d9deafe9
1 changed files with 4 additions and 2 deletions
|
|
@ -1474,8 +1474,10 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim)
|
|||
// not moving down yet?
|
||||
if (attacker->actionState == 0) { return FALSE; }
|
||||
victim->bounceSquishTimer = max(victim->bounceSquishTimer, 20);
|
||||
} else if ((attacker->action == ACT_FORWARD_ROLLOUT || attacker->action == ACT_BACKWARD_ROLLOUT) &&
|
||||
attacker->actionState == 1) {
|
||||
}
|
||||
// Make rollouts unable to be attacked during the flip
|
||||
if ((cVictim->action == ACT_FORWARD_ROLLOUT || cVictim->action == ACT_BACKWARD_ROLLOUT) &&
|
||||
cVictim->actionState == 1) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue