thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-26 20:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent playing star cutscene when in cutscene

Browse source
This commit is contained in:
MysterD 2020-10-14 23:36:19 -07:00
parent 71bc444fa2
commit 66eb163339
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/behaviors/sparkle_spawn_star.inc.c
View file

@ -82,10 +82,12 @@ void slow_star_rotation(void) {
void bhv_spawned_star_loop(void) {
if (o->oAction == 0) {
if (o->oTimer == 0) {
cutscene_object(CUTSCENE_STAR_SPAWN, o);
gMarioStates[0].freeze = 60;
set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_MARIO_AND_DOORS);
o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP;
if ((gMarioStates[0].action & ACT_GROUP_MASK) != ACT_GROUP_CUTSCENE) {
cutscene_object(CUTSCENE_STAR_SPAWN, o);
gMarioStates[0].freeze = 60;
set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_MARIO_AND_DOORS);
o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP;
}
o->oAngleVelYaw = 0x800;
if (o->oBehParams2ndByte == 0)
set_home_to_mario();

17
src/game/behaviors/spawn_star.inc.c
View file

@ -42,14 +42,17 @@ void bhv_star_spawn_init(void) {
o->oVelY = (o->oHomeY - o->oPosY) / 30.0f;
o->oForwardVel = o->oStarSpawnDisFromHome / 30.0f;
o->oStarSpawnUnkFC = o->oPosY;
if (o->oBehParams2ndByte == 0 || gCurrCourseNum == COURSE_BBH)
cutscene_object(CUTSCENE_STAR_SPAWN, o);
else
cutscene_object(CUTSCENE_RED_COIN_STAR_SPAWN, o);
gMarioStates[0].freeze = 60;
set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_MARIO_AND_DOORS);
o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP;
if ((gMarioStates[0].action & ACT_GROUP_MASK) != ACT_GROUP_CUTSCENE) {
if (o->oBehParams2ndByte == 0 || gCurrCourseNum == COURSE_BBH)
cutscene_object(CUTSCENE_STAR_SPAWN, o);
else
cutscene_object(CUTSCENE_RED_COIN_STAR_SPAWN, o);
gMarioStates[0].freeze = 60;
set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_MARIO_AND_DOORS);
o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP;
}
cur_obj_become_intangible();
}