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

Prevent situation where both players hold same object

Browse source
This commit is contained in:
MysterD 2020-08-01 18:56:42 -07:00
parent 7accb94398
commit fa2470327f
6 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/behaviors/bobomb.inc.c
View file

@ -179,6 +179,7 @@ void bobomb_free_loop(void) {
void bobomb_held_loop(void) {
o->header.gfx.node.flags |= GRAPH_RENDER_INVISIBLE;
cur_obj_init_animation(1);
// LUIGI TODO: we need to be able to get the player that is actually holding it.
struct Object* player = nearest_player_to_object(o);
cur_obj_set_pos_relative(player, 0, 60.0f, 100.0);

3
src/game/interaction.c
View file

@ -285,6 +285,7 @@ void mario_stop_riding_object(struct MarioState *m) {
}
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;
obj_set_held_state(m->heldObj, bhvCarrySomething3);
@ -418,6 +419,8 @@ u32 mario_check_object_grab(struct MarioState *m) {
u32 result = FALSE;
void *script;
if (m->interactObj == NULL || m->interactObj->oHeldState == HELD_HELD) { return FALSE; }
if (m->input & INPUT_INTERACT_OBJ_GRABBABLE) {
script = virtual_to_segmented(0x13, m->interactObj->behavior);

8
src/game/mario_actions_airborne.c
View file

@ -719,9 +719,11 @@ s32 act_dive(struct MarioState *m) {
set_mario_animation(m, MARIO_ANIM_DIVE);
if (mario_check_object_grab(m)) {
mario_grab_used_object(m);
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
if (m->action != ACT_DIVE) {
return TRUE;
if (m->heldObj != NULL) {
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
if (m->action != ACT_DIVE) {
return TRUE;
}
}
}

4
src/game/mario_actions_moving.c
View file

@ -1581,7 +1581,9 @@ s32 act_dive_slide(struct MarioState *m) {
if (mario_check_object_grab(m)) {
mario_grab_used_object(m);
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
if (m->heldObj != NULL) {
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
}
return TRUE;
}

12
src/game/mario_actions_object.c
View file

@ -187,8 +187,10 @@ s32 act_picking_up(struct MarioState *m) {
// to unload. This allows you to pick up a vacant or newly loaded object
// slot (cloning via fake object).
mario_grab_used_object(m);
play_sound_if_no_flag(m, SOUND_MARIO_HRMM, MARIO_MARIO_SOUND_PLAYED);
m->actionState = 1;
if (m->heldObj != NULL) {
play_sound_if_no_flag(m, SOUND_MARIO_HRMM, MARIO_MARIO_SOUND_PLAYED);
m->actionState = 1;
}
}
if (m->actionState == 1) {
@ -315,8 +317,10 @@ s32 act_picking_up_bowser(struct MarioState *m) {
m->angleVel[1] = 0;
m->marioBodyState->grabPos = GRAB_POS_BOWSER;
mario_grab_used_object(m);
queue_rumble_data(5, 80);
play_sound(SOUND_MARIO_HRMM, m->marioObj->header.gfx.cameraToObject);
if (m->heldObj != NULL) {
queue_rumble_data(5, 80);
play_sound(SOUND_MARIO_HRMM, m->marioObj->header.gfx.cameraToObject);
}
}
set_mario_animation(m, MARIO_ANIM_GRAB_BOWSER);

6
src/game/mario_actions_submerged.c
View file

@ -778,8 +778,10 @@ static s32 check_water_grab(struct MarioState *m) {
if (dAngleToObject >= -0x2AAA && dAngleToObject <= 0x2AAA) {
m->usedObj = object;
mario_grab_used_object(m);
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
return TRUE;
if (m->heldObj != NULL) {
m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
return TRUE;
}
}
}