Skip to content

Commit 7f68c46

Browse files
authored
Merge pull request #671 from joshuarwood/light_fix_for_laser
Exclude laser doors from lighting line-of-sight test
2 parents 7971136 + f3f2a59 commit 7f68c46

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/game/prop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g
10661066
if (prop->type == PROPTYPE_CHR
10671067
|| (prop->type == PROPTYPE_PLAYER && prop->chr && (g_Vars.in_cutscene || playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum))) {
10681068
chrTestHit(prop, &shotdata, false, true);
1069-
} else if (prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR
1069+
} else if (prop->type == PROPTYPE_WEAPON || (prop->type == PROPTYPE_DOOR && ((struct doorobj *)prop->obj)->doortype != DOORTYPE_LASER)
10701070
|| (prop->type == PROPTYPE_OBJ && prop->obj->type != OBJTYPE_GLASS && prop->obj->type != OBJTYPE_TINTEDGLASS)) {
10711071
objTestHit(prop, &shotdata);
10721072
}

0 commit comments

Comments
 (0)