From f86746364fe15890d95c800599ed3f3a9cc27296 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sun, 12 May 2024 17:12:37 +0200 Subject: [PATCH] port: no need to explicitly disable player collision when tracing light glares --- src/game/game_13c510.c | 9 --------- src/game/prop.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 8ac5f0515..c2b4b81e9 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -168,11 +168,6 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) struct coord *campos = &g_Vars.currentplayer->cam_pos; struct artifact *artifact; -#ifndef PLATFORM_N64 - const bool prevperim = g_Vars.currentplayer->bondperimenabled; - playerSetPerimEnabled(g_Vars.currentplayer->prop, false); -#endif - if (g_Rooms[roomnum].gfxdata != NULL && g_Rooms[roomnum].loaded240) { numlights = g_Rooms[roomnum].gfxdata->numlights; @@ -378,10 +373,6 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) } } } - -#ifndef PLATFORM_N64 - playerSetPerimEnabled(g_Vars.currentplayer->prop, prevperim); -#endif } u8 func0f13d3c4(u8 arg0, u8 arg1) diff --git a/src/game/prop.c b/src/game/prop.c index 4dbbba9f0..ae8da24f2 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -1062,7 +1062,7 @@ bool shotTestLos(struct coord *gunpos2d, struct coord *gundir2d, struct coord *g prop = *propptr; if (prop) { if (prop->type == PROPTYPE_CHR - || (prop->type == PROPTYPE_PLAYER && prop->chr && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum)) { + || (prop->type == PROPTYPE_PLAYER && prop->chr && (g_Vars.in_cutscene || playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum))) { chrTestHit(prop, &shotdata, false, true); } else if (prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR || (prop->type == PROPTYPE_OBJ && prop->obj->type != OBJTYPE_GLASS && prop->obj->type != OBJTYPE_TINTEDGLASS)) {