thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-18 22:12:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add sprung flag to steam

Browse source 
# Conflicts:
#	src/p_map.c
This commit is contained in:
toaster 2022-03-18 13:39:19 +00:00
parent 19a4ef23c2
commit 3c83508646
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_map.c
View file

@ -493,12 +493,11 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
break; break;
if (spring->state != &states[S_STEAM1]) // Only when it bursts if (spring->state != &states[S_STEAM1]) // Only when it bursts
break; break;
if (spring->spawnpoint && spring->spawnpoint->options & MTF_OBJECTSPECIAL)
{
if (object->eflags & MFE_SPRUNG) if (object->eflags & MFE_SPRUNG)
break; break;
if (spring->spawnpoint && spring->spawnpoint->options & MTF_OBJECTSPECIAL)
{
if (object->player) if (object->player)
{ {
object->player->trickpanel = 1; object->player->trickpanel = 1;
@ -506,10 +505,13 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
} }
K_DoPogoSpring(object, 32<<FRACBITS, 0); K_DoPogoSpring(object, 32<<FRACBITS, 0);
return;
} }
else else
{
object->momz = flipval*FixedMul(speed, FixedSqrt(FixedMul(spring->scale, object->scale))); // scale the speed with both objects' scales, just like with springs! object->momz = flipval*FixedMul(speed, FixedSqrt(FixedMul(spring->scale, object->scale))); // scale the speed with both objects' scales, just like with springs!
}
object->eflags |= MFE_SPRUNG;
break; break;
default: default:
break; break;