Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed stomache slide hang, made grabs only happen on local

This commit is contained in:
MysterD 2020-08-29 12:57:20 -07:00
parent f19044cf55
commit f372e44b04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/interaction.c
View File

@ -289,8 +289,7 @@ void mario_grab_used_object(struct MarioState *m) {
if (m->usedObj == NULL || m->usedObj->oHeldState == HELD_HELD) { return; }
if (m->heldObj == NULL) {
m->heldObj = m->usedObj;
// two-player hack
m->heldObj->heldByPlayerIndex = (m == &gMarioStates[0]) ? 0 : 1;
m->heldObj->heldByPlayerIndex = m->playerIndex;
obj_set_held_state(m->heldObj, bhvCarrySomething3);
}
}
@ -422,6 +421,7 @@ u32 mario_check_object_grab(struct MarioState *m) {
u32 result = FALSE;
void *script;
if (m->playerIndex != 0) { return FALSE; }
if (m->interactObj == NULL || m->interactObj->oHeldState == HELD_HELD) { return FALSE; }
if (m->input & INPUT_INTERACT_OBJ_GRABBABLE) {