From 8bf731525387933d3d30b1326c39f3bf9d05f12f Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 20 Jan 2022 12:57:17 -0800
Subject: [PATCH] prop_dynamic: Now solid by default, unless spawnflags bit 256
 is set.

---
 src/gs-entbase/server/prop_dynamic.qc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gs-entbase/server/prop_dynamic.qc b/src/gs-entbase/server/prop_dynamic.qc
index 2c21f8f3..1d610452 100644
--- a/src/gs-entbase/server/prop_dynamic.qc
+++ b/src/gs-entbase/server/prop_dynamic.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*QUAKED prop_dynamic (0 0.2 1) (-8 -8 -8) (8 8 8) SF_BASIC_COL
+/*QUAKED prop_dynamic (0 0.2 1) (-8 -8 -8) (8 8 8) x x x x x x x x PRPDYN_NONSOLID
 Client-side decorative model entity.
 
 -------- KEYS --------
@@ -27,6 +27,8 @@ Client-side decorative model entity.
 This entity was introduced in Half-Life 2 (2004).
 */
 
+#define PRPDYN_NONSOLID 256
+
 class prop_dynamic:NSSurfacePropEntity
 {
 	void(void) prop_dynamic;
@@ -39,7 +41,11 @@ prop_dynamic::Respawn(void)
 {
 	super::Respawn();
 	SetModel(GetSpawnModel());
-	SetSolid(SOLID_CORPSE);
+
+	if (spawnflags & PRPDYN_NONSOLID)
+		SetSolid(SOLID_NOT);
+	else
+		SetSolid(SOLID_BBOX);
 }
 
 void