From 0d8e13e94208ff614c5de160b8f217774cd6c9ef Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Thu, 22 Dec 2022 01:35:08 -0500
Subject: [PATCH] Fix spring stack overflow

Closes #377
---
 src/p_map.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/p_map.c b/src/p_map.c
index 254706ce6..50f0fb991 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -277,6 +277,12 @@ P_DoSpringEx
 		angle_t finalAngle,
 		UINT16 starcolor)
 {
+	if (object->eflags & MFE_SPRUNG)
+	{
+		// Object was already sprung this tic
+		return;
+	}
+
 	if (horizspeed < 0)
 	{
 		horizspeed = -(horizspeed);
@@ -402,7 +408,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 		return false;
 	}
 
-	spring->flags &= ~(MF_SOLID|MF_SPECIAL); // De-solidify
+	spring->flags |= MF_NOCLIPTHING; // De-solidify
 
 	if (spring->eflags & MFE_VERTICALFLIP)
 		vertispeed *= -1;
@@ -445,7 +451,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 			spring->angle, starcolor);
 
 	// 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)
 	{