Prevent unrestricted items camera crash (#852)

HarbourMasters · Jul 21, 2022 · eb49053 · eb49053
1 parent d08b1d2
commit eb49053
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
@@ -402,6 +402,12 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) {
 
     camera = GET_ACTIVE_CAM(globalCtx);
     camId = camera->camDataIdx;
+    if (camId == -1 && CVar_GetS32("gNoRestrictItems", 0)) {
+        // This prevents a crash when using items that change the
+        // camera (such as din's fire) on scenes with prerendered backgrounds
+        return NULL;
+    }
+
     // jfifid
     camId2 = func_80041C10(&globalCtx->colCtx, camId, BGCHECK_SCENE)[2].y;
     if (camId2 >= 0) {