mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
CrowdControl bypass voidout/die crash in pre-rendered background areas (#3186)
* Bypass camera crash when voiding/dying in fixed camera areas * Update comment
This commit is contained in:
parent
db10864e95
commit
5d3429e04f
@ -403,9 +403,10 @@ BgImage* func_80096A74(PolygonType1* polygon1, PlayState* play) {
|
|||||||
|
|
||||||
camera = GET_ACTIVE_CAM(play);
|
camera = GET_ACTIVE_CAM(play);
|
||||||
camId = camera->camDataIdx;
|
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
|
// 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;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user