thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed stomache slide hang, made grabs only happen on local

Browse source
This commit is contained in:
MysterD 2020-08-29 12:57:20 -07:00
parent cb5dcaa4f4
commit 13d4a0bfe8
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->usedObj == NULL || m->usedObj->oHeldState == HELD_HELD) { return; }
if (m->heldObj == NULL) { if (m->heldObj == NULL) {
m->heldObj = m->usedObj; m->heldObj = m->usedObj;
// two-player hack m->heldObj->heldByPlayerIndex = m->playerIndex;
m->heldObj->heldByPlayerIndex = (m == &gMarioStates[0]) ? 0 : 1;
obj_set_held_state(m->heldObj, bhvCarrySomething3); obj_set_held_state(m->heldObj, bhvCarrySomething3);
} }
} }
@ -422,6 +421,7 @@ u32 mario_check_object_grab(struct MarioState *m) {
u32 result = FALSE; u32 result = FALSE;
void *script; void *script;
if (m->playerIndex != 0) { return FALSE; }
if (m->interactObj == NULL || m->interactObj->oHeldState == HELD_HELD) { return FALSE; } if (m->interactObj == NULL || m->interactObj->oHeldState == HELD_HELD) { return FALSE; }
if (m->input & INPUT_INTERACT_OBJ_GRABBABLE) { if (m->input & INPUT_INTERACT_OBJ_GRABBABLE) {