thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'emerald-timer' into 'master'

Browse source 
Add fuse to Emeralds in Battle

Closes #126

See merge request KartKrew/Kart!1091
This commit is contained in:
James R 2023-03-27 12:12:17 +00:00
commit 06f58486a5
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_battle.c
View file

@ -247,6 +247,11 @@ mobj_t *K_SpawnChaosEmerald(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT
P_SetMobjState(overlay, S_CHAOSEMERALD_UNDER);
overlay->color = emerald->color;
if (gametyperules & GTR_CLOSERPLAYERS)
{
emerald->fuse = BATTLE_DESPAWN_TIME;
}
return emerald;
}

2
src/k_kart.c
View file

@ -6441,7 +6441,7 @@ mobj_t *K_CreatePaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8
P_SetTarget(&backdrop->tracer, drop);
backdrop->flags2 |= MF2_LINKDRAW;
if (gametyperules & GTR_BUMPERS)
if (gametyperules & GTR_CLOSERPLAYERS)
{
drop->fuse = BATTLE_DESPAWN_TIME;
}

1
src/p_mobj.c
View file

@ -9636,6 +9636,7 @@ static boolean P_CanFlickerFuse(mobj_t *mobj)
case MT_FLOATINGITEM:
case MT_POGOSPRING:
case MT_KART_LEFTOVER:
case MT_EMERALD:
if (mobj->fuse <= TICRATE)
{
return true;