thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix spring stack overflow

Browse source 
Closes #377
This commit is contained in:
Sally Coolatta 2022-12-22 01:35:08 -05:00
parent 33167078c8
commit 0d8e13e942
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_map.c
View file

@ -277,6 +277,12 @@ P_DoSpringEx
angle_t finalAngle, angle_t finalAngle,
UINT16 starcolor) UINT16 starcolor)
{ {
if (object->eflags & MFE_SPRUNG)
{
// Object was already sprung this tic
return;
}
if (horizspeed < 0) if (horizspeed < 0)
{ {
horizspeed = -(horizspeed); horizspeed = -(horizspeed);
@ -402,7 +408,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
return false; return false;
} }
spring->flags &= ~(MF_SOLID|MF_SPECIAL); // De-solidify spring->flags |= MF_NOCLIPTHING; // De-solidify
if (spring->eflags & MFE_VERTICALFLIP) if (spring->eflags & MFE_VERTICALFLIP)
vertispeed *= -1; vertispeed *= -1;
@ -445,7 +451,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
spring->angle, starcolor); spring->angle, starcolor);
// Re-solidify // Re-solidify
spring->flags |= (spring->info->flags & (MF_SPRING|MF_SPECIAL)); spring->flags = (spring->flags & ~(MF_NOCLIPTHING)) | (spring->info->flags & (MF_NOCLIPTHING));
if (object->player) if (object->player)
{ {