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

Prevent rare bug where a remote player will grab a non-grabbable object momentarily

This commit is contained in:
MysterD 2020-10-04 23:06:52 -07:00
parent 5eb5e678c5
commit e9761cd3e6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/interaction.c
View File

@ -303,6 +303,8 @@ void mario_stop_riding_object(struct MarioState *m) {
void mario_grab_used_object(struct MarioState *m) { 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 && m->usedObj != NULL) { if (m->heldObj == NULL && m->usedObj != NULL) {
// prevent grabbing a non-grabbable object
if (!(m->usedObj->oInteractType & INTERACT_GRABBABLE)) { return; }
m->heldObj = m->usedObj; m->heldObj = m->usedObj;
m->heldObj->heldByPlayerIndex = m->playerIndex; m->heldObj->heldByPlayerIndex = m->playerIndex;
obj_set_held_state(m->heldObj, bhvCarrySomething3); obj_set_held_state(m->heldObj, bhvCarrySomething3);