Merge public master

This commit is contained in:
Eidolon 2025-09-01 13:29:04 -05:00
commit 9f9fe44b10
2 changed files with 2 additions and 3 deletions

View file

@ -11564,7 +11564,7 @@ void K_KartResetPlayerColor(player_t *player)
goto finalise;
}
if (player->ringboost && (leveltime & 1)) // ring boosting
if (player->ringboost && (leveltime & 1) && (((R_CanShowSkinInDemo(player->skin))) || ((!R_CanShowSkinInDemo(player->skin)) && !cv_reducevfx.value && demo.playback))) // ring boosting + messy condition stack for, specifically, disabling this when viewing a staff ghost replay of a currently hidden character
{
player->mo->colorized = true;
fullbright = true;

View file

@ -46,8 +46,7 @@ INT32 R_ThingLightLevel(mobj_t* thing)
}
if (!R_CanShowSkinInDemo(((skin_t*)thing->skin)->skinnum)
&& !thing->colorized
&& !thing->hitlag)
&& ((cv_reducevfx.value) || (!thing->colorized && !thing->hitlag)))
{
lightlevel -= 128;
}