mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'reducevfx-battle' into 'master'
Disable overtime barrier animation/flashing when reducevfx is enabled. See merge request kart-krew-dev/ring-racers!74
This commit is contained in:
commit
0e431cd334
1 changed files with 17 additions and 8 deletions
|
|
@ -740,8 +740,11 @@ static void K_SpawnOvertimeLaser(fixed_t x, fixed_t y, fixed_t scale)
|
||||||
case 0:
|
case 0:
|
||||||
P_SetMobjState(mo, S_OVERTIME_BULB1);
|
P_SetMobjState(mo, S_OVERTIME_BULB1);
|
||||||
|
|
||||||
|
if (!cv_reducevfx.value)
|
||||||
|
{
|
||||||
if (leveltime & 1)
|
if (leveltime & 1)
|
||||||
mo->frame += 1;
|
mo->frame += 1;
|
||||||
|
}
|
||||||
|
|
||||||
//P_SetScale(mo, mapobjectscale);
|
//P_SetScale(mo, mapobjectscale);
|
||||||
zpos += 35 * mo->scale * flip;
|
zpos += 35 * mo->scale * flip;
|
||||||
|
|
@ -749,10 +752,13 @@ static void K_SpawnOvertimeLaser(fixed_t x, fixed_t y, fixed_t scale)
|
||||||
case 1:
|
case 1:
|
||||||
P_SetMobjState(mo, S_OVERTIME_LASER);
|
P_SetMobjState(mo, S_OVERTIME_LASER);
|
||||||
|
|
||||||
|
if (!cv_reducevfx.value)
|
||||||
|
{
|
||||||
if (leveltime & 1)
|
if (leveltime & 1)
|
||||||
mo->frame += 3;
|
mo->frame += 3;
|
||||||
else
|
else
|
||||||
mo->frame += (leveltime / 2) % 3;
|
mo->frame += (leveltime / 2) % 3;
|
||||||
|
}
|
||||||
|
|
||||||
//P_SetScale(mo, scale);
|
//P_SetScale(mo, scale);
|
||||||
zpos += 346 * mo->scale * flip;
|
zpos += 346 * mo->scale * flip;
|
||||||
|
|
@ -763,8 +769,11 @@ static void K_SpawnOvertimeLaser(fixed_t x, fixed_t y, fixed_t scale)
|
||||||
case 2:
|
case 2:
|
||||||
P_SetMobjState(mo, S_OVERTIME_BULB2);
|
P_SetMobjState(mo, S_OVERTIME_BULB2);
|
||||||
|
|
||||||
|
if (!cv_reducevfx.value)
|
||||||
|
{
|
||||||
if (leveltime & 1)
|
if (leveltime & 1)
|
||||||
mo->frame += 1;
|
mo->frame += 1;
|
||||||
|
}
|
||||||
|
|
||||||
//P_SetScale(mo, mapobjectscale);
|
//P_SetScale(mo, mapobjectscale);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue