diff options
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_room.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index 72b163ef7..81fe2714b 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -403,9 +403,10 @@ BgImage* func_80096A74(PolygonType1* polygon1, PlayState* play) { camera = GET_ACTIVE_CAM(play); camId = camera->camDataIdx; - if (camId == -1 && CVarGetInteger("gNoRestrictItems", 0)) { + if (camId == -1 && (CVarGetInteger("gNoRestrictItems", 0) || CVarGetInteger("gCrowdControl", 0))) { // This prevents a crash when using items that change the - // camera (such as din's fire) on scenes with prerendered backgrounds + // camera (such as din's fire), voiding out or dying on + // scenes with prerendered backgrounds. return NULL; } |