Skip to content

Lighting fix for Dr Caroll cutscene #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshuarwood wants to merge 4 commits into
base: port
Choose a base branch
from
+6 −0
Open

Lighting fix for Dr Caroll cutscene #665

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f434a4
account for camera clipping through the wall in dr caroll cutscene wh…
joshuarwood Nov 3, 2025
e59ebf7
fix minor typo in comment string
joshuarwood Nov 4, 2025
b68b29a
use stagenum constant rather than hard coded number
joshuarwood Nov 4, 2025
e34ed97
Merge branch 'port' into dr_caroll_light_fix
joshuarwood Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/game/prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,12 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g

// Check for BG hits first
for (i = 0; rooms[i] != -1; i++) {
if (g_Vars.stagenum == STAGE_INVESTIGATION && rooms[i] == 100) {
// skip BG test during final cutscene of the dataDyne Research
// level since the camera clips through the wall, which will
// incorrectly remove lights when Dr Caroll first appears.
continue;
}
if (bgTestHitInRoom(&shotdata.gunpos3d, endpos3d, rooms[i], &hitthing)) {
// check if it's far enough away from the end point
if (fabsf(hitthing.pos.x - endpos3d->x) >= 0.1f ||
Expand Down