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 'pogo-fuse' into 'master'

Browse source 
Add fuse to Pogo Spring

See merge request KartKrew/Kart!942
This commit is contained in:
Oni 2023-02-21 06:16:50 +00:00
commit 1f968d51c5
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_map.c
View file

@ -465,6 +465,11 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
object->momz = 3 * object->momz / 2; object->momz = 3 * object->momz / 2;
} }
if (!spring->fuse)
{
spring->fuse = 15*TICRATE;
}
spring->reactiontime++; spring->reactiontime++;
} }
} }

1
src/p_mobj.c
View file

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