Prevented softlock when collecting an object that is the focus of a cutscene

This commit is contained in:
MysterD 2021-08-23 19:03:14 -07:00
parent ef94e319b6
commit 9398d41179
2 changed files with 7 additions and 1 deletions

View File

@ -11290,6 +11290,13 @@ void play_cutscene(struct Camera *c) {
sStatusFlags &= ~CAM_FLAG_SMOOTH_MOVEMENT;
gCameraMovementFlags &= ~CAM_MOVING_INTO_MODE;
if (gCutsceneFocus != NULL) {
if (gCutsceneFocus->activeFlags == ACTIVE_FLAG_DEACTIVATED) {
gObjCutsceneDone = true;
gTimeStopState = 0;
}
}
#define CUTSCENE(id, cutscene) \
case id: \
cutsceneDuration = cutscene[sCutsceneShot].duration; \

View File

@ -304,7 +304,6 @@ void network_update(void) {
network_on_loaded_area();
}
}
SOFT_ASSERT(false);
// update network area timer
network_update_area_timer();