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

Synchronized end cutscene, prevented crash

This commit is contained in:
MysterD 2020-09-23 19:48:24 -07:00
parent f811a37e76
commit 8d2f6a6137
4 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/behaviors/bully.inc.c
View File

@ -69,9 +69,11 @@ void bhv_big_bully_init(void) {
obj_set_hitbox(o, &sBigBullyHitbox);
bhv_bully_network_init();
spawn_object_abs_with_rot(o, 0, MODEL_NONE, bhvLllTumblingBridge, 0, 154, -5631, 0, 0, 0);
struct Object* lllTumblingBridge = cur_obj_nearest_object_with_behavior(bhvLllTumblingBridge);
if (lllTumblingBridge != NULL) { lllTumblingBridge->oIntangibleTimer = -1; }
if (gCurrCourseNum == COURSE_LLL) {
spawn_object_abs_with_rot(o, 0, MODEL_NONE, bhvLllTumblingBridge, 0, 154, -5631, 0, 0, 0);
struct Object* lllTumblingBridge = cur_obj_nearest_object_with_behavior(bhvLllTumblingBridge);
if (lllTumblingBridge != NULL) { lllTumblingBridge->oIntangibleTimer = -1; }
}
}
void bully_check_mario_collision(void) {

14
src/game/level_update.c
View File

@ -517,6 +517,10 @@ void warp_credits(void) {
load_area(sWarpDest.areaIdx);
if (gCurrCreditsEntry == NULL) {
gCurrCreditsEntry = &sCreditsSequence[0];
}
for (int i = 0; i < MAX_PLAYERS; i++) {
vec3s_set(gPlayerSpawnInfos[i].startPos, gCurrCreditsEntry->marioPos[0],
gCurrCreditsEntry->marioPos[1], gCurrCreditsEntry->marioPos[2]);
@ -885,7 +889,6 @@ void initiate_delayed_warp(void) {
case WARP_OP_CREDITS_NEXT:
sound_banks_disable(2, 0x03FF);
gCurrCreditsEntry += 1;
gCurrActNum = gCurrCreditsEntry->unk02 & 0x07;
if ((gCurrCreditsEntry + 1)->levelNum == LEVEL_NONE) {
@ -1044,7 +1047,14 @@ s32 play_mode_normal(void) {
// If either initiate_painting_warp or initiate_delayed_warp initiated a
// warp, change play mode accordingly.
if (sCurrPlayMode == PLAY_MODE_NORMAL) {
if (!gReceiveWarp) {
if (gCurrCreditsEntry != NULL && gCurrCreditsEntry != &sCreditsSequence[0]) {
// special case for credit warps
if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL) {
set_play_mode(PLAY_MODE_CHANGE_LEVEL);
} else if (sTransitionTimer != 0) {
set_play_mode(PLAY_MODE_CHANGE_AREA);
}
} else if (!gReceiveWarp) {
if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL) {
set_play_mode(PLAY_MODE_SYNC_LEVEL);
network_send_level_warp_begin();

64
src/game/mario_actions_cutscene.c
View File

@ -2146,9 +2146,11 @@ static void end_peach_cutscene_mario_landing(struct MarioState *m) {
// make wing cap run out
m->capTimer = 60;
sEndJumboStarObj = spawn_object_abs_with_rot(gCurrentObject, 0, MODEL_STAR, bhvStaticObject, 0,
2528, -1800, 0, 0, 0);
obj_scale(sEndJumboStarObj, 3.0);
if (m->playerIndex == 0) {
sEndJumboStarObj = spawn_object_abs_with_rot(gCurrentObject, 0, MODEL_STAR, bhvStaticObject, 0,
2528, -1800, 0, 0, 0);
obj_scale(sEndJumboStarObj, 3.0);
}
advance_cutscene_step(m);
}
}
@ -2157,7 +2159,7 @@ static void end_peach_cutscene_mario_landing(struct MarioState *m) {
static void end_peach_cutscene_summon_jumbo_star(struct MarioState *m) {
set_mario_animation(m, m->actionState == 0 ? MARIO_ANIM_CREDITS_RAISE_HAND
: MARIO_ANIM_CREDITS_LOWER_HAND);
if (m->playerIndex != 0) { return; }
if (m->actionState == 0 && is_anim_past_end(m)) {
m->actionState++;
}
@ -2183,6 +2185,7 @@ static void end_peach_cutscene_summon_jumbo_star(struct MarioState *m) {
// free peach from the stained glass window
static void end_peach_cutscene_spawn_peach(struct MarioState *m) {
if (m->playerIndex != 0) { return; }
if (m->actionTimer == 1) {
play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 14, 255, 255, 255);
}
@ -2240,6 +2243,7 @@ static void end_peach_cutscene_spawn_peach(struct MarioState *m) {
// descend peach
static void end_peach_cutscene_descend_peach(struct MarioState *m) {
if (m->playerIndex != 0) { return; }
generate_yellow_sparkles(0, sEndPeachObj->oPosY, -1300, 150.0f);
if (sEndPeachObj->oPosY >= 1300.0f) {
@ -2305,6 +2309,8 @@ static void end_peach_cutscene_dialog_1(struct MarioState *m) {
}
}
if (m->playerIndex != 0) { return; }
switch (m->actionTimer) {
case 80:
sEndPeachAnimation = 6;
@ -2362,6 +2368,7 @@ static void end_peach_cutscene_dialog_1(struct MarioState *m) {
// "Thank you Mario!"
// "We have to do something special for you..."
static void end_peach_cutscene_dialog_2(struct MarioState *m) {
if (m->playerIndex != 0) { return; }
sEndPeachAnimation = 9;
switch (m->actionTimer) {
@ -2452,15 +2459,16 @@ static void end_peach_cutscene_kiss_from_peach(struct MarioState *m) {
}
static void end_peach_cutscene_star_dance(struct MarioState *m) {
s32 animFrame = set_mario_animation(m, MARIO_ANIM_CREDITS_PEACE_SIGN);
u8 sadLuigi = (gNetworkType == NT_SERVER) ? (m->playerIndex != 0) : (m->playerIndex == 0);
s32 animFrame = set_mario_animation(m, sadLuigi ? MARIO_ANIM_START_SLEEP_SITTING : MARIO_ANIM_CREDITS_PEACE_SIGN);
if (animFrame == 77) {
if (animFrame == (sadLuigi ? 0 : 77)) {
cutscene_put_cap_on(m);
}
if (animFrame == 88) {
if (animFrame == 88 && m->playerIndex == 0) {
play_sound(SOUND_MARIO_HERE_WE_GO, m->marioObj->header.gfx.cameraToObject);
}
if (animFrame >= 98) {
if (!sadLuigi && animFrame >= 98) {
m->marioBodyState->handState = MARIO_HAND_PEACE_SIGN;
}
@ -2486,10 +2494,12 @@ static void end_peach_cutscene_star_dance(struct MarioState *m) {
break;
case 140:
if (m->playerIndex == 0) {
#ifndef VERSION_JP
sequence_player_unlower(SEQ_PLAYER_LEVEL, 60);
sequence_player_unlower(SEQ_PLAYER_LEVEL, 60);
#endif
play_cutscene_music(SEQUENCE_ARGS(15, SEQ_EVENT_CUTSCENE_CREDITS));
play_cutscene_music(SEQUENCE_ARGS(15, SEQ_EVENT_CUTSCENE_CREDITS));
}
break;
case 142:
@ -2503,8 +2513,9 @@ static void end_peach_cutscene_star_dance(struct MarioState *m) {
// "let's bake a delicious cake..."
// "...for Mario..."
static void end_peach_cutscene_dialog_3(struct MarioState *m) {
set_mario_animation(m, MARIO_ANIM_FIRST_PERSON);
u8 sadLuigi = (gNetworkType == NT_SERVER) ? (m->playerIndex != 0) : (m->playerIndex == 0);
set_mario_animation(m, sadLuigi ? MARIO_ANIM_SLEEP_IDLE : MARIO_ANIM_FIRST_PERSON);
if (m->playerIndex != 0) { return; }
sEndPeachObj->oPosY = end_obj_set_visual_pos(sEndPeachObj);
sEndRightToadObj->oPosY = end_obj_set_visual_pos(sEndRightToadObj);
sEndLeftToadObj->oPosY = end_obj_set_visual_pos(sEndLeftToadObj);
@ -2540,16 +2551,21 @@ static void end_peach_cutscene_dialog_3(struct MarioState *m) {
// "Mario!"
static void end_peach_cutscene_run_to_castle(struct MarioState *m) {
set_mario_animation(m, m->actionState == 0 ? MARIO_ANIM_CREDITS_START_WALK_LOOK_UP
: MARIO_ANIM_CREDITS_LOOK_BACK_THEN_RUN);
m->marioObj->header.gfx.pos[1] = end_obj_set_visual_pos(m->marioObj);
u8 sadLuigi = (gNetworkType == NT_SERVER) ? (m->playerIndex != 0) : (m->playerIndex == 0);
if (sadLuigi) {
set_mario_animation(m, m->actionState == 0 ? MARIO_ANIM_SLEEP_START_LYING
: MARIO_ANIM_SLEEP_LYING);
} else {
set_mario_animation(m, m->actionState == 0 ? MARIO_ANIM_CREDITS_START_WALK_LOOK_UP
: MARIO_ANIM_CREDITS_LOOK_BACK_THEN_RUN);
m->marioObj->header.gfx.pos[1] = end_obj_set_visual_pos(m->marioObj);
}
if (m->actionState == 0 && is_anim_past_end(m)) {
m->actionState = 1;
}
if (m->actionTimer == 95) {
if (m->actionTimer == 95 && m->playerIndex == 0) {
set_cutscene_message(160, 227, 0, 40);
#ifndef VERSION_JP
play_sound(SOUND_PEACH_MARIO2, sEndPeachObj->header.gfx.cameraToObject);
@ -2561,7 +2577,7 @@ static void end_peach_cutscene_run_to_castle(struct MarioState *m) {
}
static void end_peach_cutscene_fade_out(struct MarioState *m) {
if (m->actionState == 0) {
if (m->actionState == 0 && m->playerIndex == 0) {
level_trigger_warp(m, WARP_OP_CREDITS_NEXT);
gPaintingMarioYEntry = 1500.0f; // ensure medium water level in WDW credits cutscene
m->actionState = 1;
@ -2629,11 +2645,13 @@ static s32 act_end_peach_cutscene(struct MarioState *m) {
m->actionTimer++;
sEndCutsceneVp.vp.vscale[0] = 640;
sEndCutsceneVp.vp.vscale[1] = 360;
sEndCutsceneVp.vp.vtrans[0] = 640;
sEndCutsceneVp.vp.vtrans[1] = 480;
override_viewport_and_clip(NULL, &sEndCutsceneVp, 0, 0, 0);
if (m->playerIndex == 0) {
sEndCutsceneVp.vp.vscale[0] = 640;
sEndCutsceneVp.vp.vscale[1] = 360;
sEndCutsceneVp.vp.vtrans[0] = 640;
sEndCutsceneVp.vp.vtrans[1] = 480;
override_viewport_and_clip(NULL, &sEndCutsceneVp, 0, 0, 0);
}
return FALSE;
}

2
src/pc/controller/controller_keyboard_debug.c
View File

@ -69,6 +69,8 @@ static void debug_warp_level(u8 level) {
}
static void debug_warp_area() {
/*level_trigger_warp(&gMarioStates[0], WARP_OP_CREDITS_START);
return;*/
if (sCurrPlayMode == PLAY_MODE_CHANGE_LEVEL) { return; }
if (sCurrPlayMode == PLAY_MODE_SYNC_LEVEL) { return; }