From 09bfe9cd0e9eab1f5fe9ea8fb9381f4e154065c6 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Mon, 23 Aug 2021 19:03:14 -0700
Subject: [PATCH] Prevented softlock when collecting an object that is the
 focus of a cutscene

---
 src/game/camera.c        | 7 +++++++
 src/pc/network/network.c | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/game/camera.c b/src/game/camera.c
index 8bc15bca8..002660f21 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -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;                                              \
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index dc5a81343..8bb6cb386 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -304,7 +304,6 @@ void network_update(void) {
             network_on_loaded_area();
         }
     }
-    SOFT_ASSERT(false);
 
     // update network area timer
     network_update_area_timer();