From 5f7ea594b84f8eb1af7d82e6c18b51fc436afacc Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 20 Sep 2023 20:54:13 -0700
Subject: [PATCH] scripted_sequence & NSMonster: support for spawnflags
 LEAVECORPSE. Also safely position monsters upon spawning to avoid them
 getting stuck in the floor.

---
 src/gs-entbase/server/scripted_sequence.qc |  5 +++--
 src/shared/NSMonster.h                     |  2 ++
 src/shared/NSMonster.qc                    | 22 +++++++++++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/gs-entbase/server/scripted_sequence.qc b/src/gs-entbase/server/scripted_sequence.qc
index b9a681e2..b0614ba8 100644
--- a/src/gs-entbase/server/scripted_sequence.qc
+++ b/src/gs-entbase/server/scripted_sequence.qc
@@ -302,7 +302,9 @@ scripted_sequence::RunOnEntity(entity targ)
 
 	f.m_iSequenceState = SEQUENCESTATE_ENDING;
 
-	if (HasSpawnFlags(SSFL_NOSCRIPTMOVE))
+	if (HasSpawnFlags(SSFL_LEAVECORPSE))
+		f.SetThink(NSMonster::FreeStateDead);
+	else if (HasSpawnFlags(SSFL_NOSCRIPTMOVE))
 		f.SetThink(NSMonster::FreeState);
 	else
 		f.SetThink(NSMonster::FreeStateMoved);
@@ -312,7 +314,6 @@ scripted_sequence::RunOnEntity(entity targ)
 	/* make sure we're forgetting about enemies and attack states in sequence */
 	f.m_eEnemy = __NULL__;
 	f.m_iMState = MONSTER_IDLE;
-	
 }
 
 void
diff --git a/src/shared/NSMonster.h b/src/shared/NSMonster.h
index 1742149b..81b3bb06 100644
--- a/src/shared/NSMonster.h
+++ b/src/shared/NSMonster.h
@@ -386,6 +386,8 @@ public:
 	virtual void FreeState(void);
 	/** Internal use only. Called when a sequence is done. */
 	virtual void FreeStateMoved(void);
+	/** Internal use only. Called when a sequence is done and we leave a corpse. */
+	virtual void FreeStateDead(void);
 	/** Internal use only. Called when a movement route is done. */
 	virtual void RouteEnded(void);
 	/** Internal use only. Called every frame to progress through a route. */
diff --git a/src/shared/NSMonster.qc b/src/shared/NSMonster.qc
index 2f1c0629..3c2ebb35 100644
--- a/src/shared/NSMonster.qc
+++ b/src/shared/NSMonster.qc
@@ -1177,6 +1177,23 @@ NSMonster::FreeStateMoved(void)
 	FreeState();
 }
 
+void
+NSMonster::FreeStateDead(void)
+{
+	vector new_origin;
+
+	new_origin = gettaginfo(this, 1);
+	NSMonster_Log("^2%s::^3FreeStateMoved^7: moved to %v", classname, new_origin);
+	SetOrigin(new_origin);
+	DropToFloor();
+
+	RemoveFlags(FL_MONSTER);
+	SetMovetype(MOVETYPE_NONE);
+	SetSolid(SOLID_CORPSE);
+	SetState(MONSTER_DEAD);
+	FreeState();
+}
+
 void
 NSMonster::RouteEnded(void)
 {
@@ -1681,7 +1698,8 @@ NSMonster::Respawn(void)
 	SetMovetype(MOVETYPE_WALK);
 	SetModel(GetSpawnModel());
 	SetSize(base_mins, base_maxs);
-	SetOrigin(GetSpawnOrigin());
+	//SetOrigin();
+	setorigin_safe(this, GetSpawnOrigin());
 	SetEyePos([0, 0, m_flEyeHeight]);
 
 	DropToFloor();
@@ -2060,8 +2078,6 @@ NSMonster::ReceiveEntity(float flNew, float flChanged)
 		setsize(this, mins * scale, maxs * scale);
 	if (flChanged & MONFL_CHANGED_BODY)
 		_UpdateGeomset();
-
-	setorigin(this, origin);
 }
 
 void