mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge public master
This commit is contained in:
commit
9f9fe44b10
2 changed files with 2 additions and 3 deletions
|
|
@ -11564,7 +11564,7 @@ void K_KartResetPlayerColor(player_t *player)
|
||||||
goto finalise;
|
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;
|
player->mo->colorized = true;
|
||||||
fullbright = true;
|
fullbright = true;
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,7 @@ INT32 R_ThingLightLevel(mobj_t* thing)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!R_CanShowSkinInDemo(((skin_t*)thing->skin)->skinnum)
|
if (!R_CanShowSkinInDemo(((skin_t*)thing->skin)->skinnum)
|
||||||
&& !thing->colorized
|
&& ((cv_reducevfx.value) || (!thing->colorized && !thing->hitlag)))
|
||||||
&& !thing->hitlag)
|
|
||||||
{
|
{
|
||||||
lightlevel -= 128;
|
lightlevel -= 128;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue