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 'springs-scaled' into 'master'

Browse source 
UDMF upscaled springs: Treat as an increased hitbox only, not as a strength multiplier

See merge request KartKrew/Kart!1346
This commit is contained in:
Oni 2023-07-23 17:22:52 +00:00
commit 5fbed38c82
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_map.c
View file

@ -355,7 +355,6 @@ P_DoSpringEx
//
boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{
const fixed_t scaleVal = FixedSqrt(FixedMul(mapobjectscale, spring->scale));
fixed_t vertispeed = spring->info->mass;
fixed_t horizspeed = spring->info->damage;
UINT16 starcolor = (spring->info->painchance % numskincolors);
@ -428,7 +427,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
object->momx = savemomx;
object->momy = savemomy;
P_DoSpringEx(object, scaleVal, vertispeed, horizspeed,
P_DoSpringEx(object, mapobjectscale, vertispeed, horizspeed,
spring->angle, starcolor);
// Re-solidify