etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed infinite hold by King Bobomb softlock

Browse source 
fixes #38
This commit is contained in:
MysterD 2020-09-10 21:55:03 -07:00
parent 71589938df
commit cb6836f818
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/mario_actions_automatic.c
View file

@ -679,6 +679,14 @@ s32 act_grabbed(struct MarioState *m) {
} }
if (m->usedObj != NULL) { m->heldByObj = m->usedObj; } if (m->usedObj != NULL) { m->heldByObj = m->usedObj; }
set_mario_animation(m, MARIO_ANIM_BEING_GRABBED); set_mario_animation(m, MARIO_ANIM_BEING_GRABBED);
// check if they should still be grabbed
if (m->playerIndex == 0) {
if (m->heldByObj == NULL || !(m->heldByObj->oInteractStatus | INT_STATUS_GRABBED_MARIO)) {
return set_mario_action(m, (m->forwardVel >= 0.0f) ? ACT_THROWN_FORWARD : ACT_THROWN_BACKWARD, FALSE);
}
}
return FALSE; return FALSE;
} }