diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md index 49ef0be29..72a3bc155 100644 --- a/docs/tr2/CHANGELOG.md +++ b/docs/tr2/CHANGELOG.md @@ -24,6 +24,7 @@ - fixed the drawbridge producing dynamic light when open (#2294) - fixed the scale of several pickup models in The Golden Mask (#2652) - fixed the shark in The Cold War not making any sounds when biting Lara (#2678) +- fixed the in-game cinematic camera at times yielding invalid positions (and hence views) in custom levels (#2754) - fixed sprites rendering black if no shade value is assigned in the level (#2701, regression from 0.8) - fixed a crash if an image was missing - fixed a crash on level load if an animation has no frames (#2746, regression from 0.8) diff --git a/src/tr2/game/camera.c b/src/tr2/game/camera.c index d29e32f9f..93ce34c17 100644 --- a/src/tr2/game/camera.c +++ b/src/tr2/game/camera.c @@ -877,6 +877,12 @@ void Camera_LoadCutsceneFrame(void) g_Camera.roll = roll; g_Camera.shift = 0; + const int16_t room_num = + Room_FindByPos(g_Camera.pos.x, g_Camera.pos.y, g_Camera.pos.z); + if (room_num != NO_ROOM_NEG) { + g_Camera.pos.room_num = room_num; + } + Viewport_AlterFOV(fov); if (g_Config.audio.enable_lara_mic) {