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

Prevent rumbling when other players are swimming

This commit is contained in:
MysterD 2023-04-24 17:00:29 -07:00
parent 0412044456
commit 6ed3c2cc60
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/behaviors/mushroom_1up.inc.c
View File

@ -11,7 +11,9 @@ void bhv_1up_interact(void) {
marioState->hurtCounter = 0; marioState->hurtCounter = 0;
} }
#ifdef VERSION_SH #ifdef VERSION_SH
if (marioState->playerIndex == 0) {
queue_rumble_data(5, 80); queue_rumble_data(5, 80);
}
#endif #endif
network_send_collect_item(o); network_send_collect_item(o);
} }

4
src/game/mario_actions_cutscene.c
View File

@ -1593,8 +1593,10 @@ s32 act_teleport_fade_out(struct MarioState *m) {
if (m->actionTimer == 0) { if (m->actionTimer == 0) {
queue_rumble_data_mario(m, 30, 70); queue_rumble_data_mario(m, 30, 70);
if (m->playerIndex == 0) {
func_sh_8024C89C(2); func_sh_8024C89C(2);
} }
}
m->flags |= MARIO_TELEPORTING; m->flags |= MARIO_TELEPORTING;
@ -1620,8 +1622,10 @@ s32 act_teleport_fade_in(struct MarioState *m) {
if (m->actionTimer == 0) { if (m->actionTimer == 0) {
queue_rumble_data_mario(m, 30, 70); queue_rumble_data_mario(m, 30, 70);
if (m->playerIndex == 0) {
func_sh_8024C89C(2); func_sh_8024C89C(2);
} }
}
if (m->actionTimer < 32) { if (m->actionTimer < 32) {
m->flags |= MARIO_TELEPORTING; m->flags |= MARIO_TELEPORTING;

2
src/game/mario_actions_submerged.c
View File

@ -577,7 +577,7 @@ static s32 act_breaststroke(struct MarioState *m) {
reset_float_globals(m); reset_float_globals(m);
} }
if (m->actionTimer < 6) { if (m->actionTimer < 6 && m->playerIndex == 0) {
func_sh_8024CA04(); func_sh_8024CA04();
} }