Add Drop to Floor flag for xen plants

wootguy · Dec 1, 2024 · 025fad9 · 025fad9
1 parent fd8f837
commit 025fad9
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/dlls/monster/CActAnimating.cpp b/dlls/monster/CActAnimating.cpp
@@ -22,3 +22,12 @@ void CActAnimating::SetActivity(Activity act)
 		ResetSequenceInfo();
 	}
 }
+
+void CActAnimating::DropToFloor()
+{
+	if( DROP_TO_FLOOR(ENT( pev ) ) == 0 )
+	{
+		ALERT(at_error, "Entity %s fell out of level at %f,%f,%f\n", STRING( pev->classname ), pev->origin.x, pev->origin.y, pev->origin.z);
+		UTIL_Remove( this );
+	}
+}
diff --git a/dlls/monster/CActAnimating.h b/dlls/monster/CActAnimating.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "CBaseAnimating.h"
 
+#define SF_XEN_PLANT_DROP_TO_FLOOR 2
+
 class CActAnimating : public CBaseAnimating
 {
 public:
@@ -13,6 +15,8 @@ class CActAnimating : public CBaseAnimating
 	virtual int	Restore(CRestore& restore);
 	static	TYPEDESCRIPTION m_SaveData[];
 
+protected:
+	void DropToFloor();
 private:
 	Activity	m_Activity;
 };
diff --git a/dlls/monster/CXenHair.cpp b/dlls/monster/CXenHair.cpp
@@ -33,6 +33,9 @@ void CXenHair::Spawn(void)
 	pev->solid = SOLID_NOT;
 	pev->movetype = MOVETYPE_NONE;
 	pev->nextthink = gpGlobals->time + RANDOM_FLOAT(0.1, 0.4);	// Load balance these a bit
+
+	if (FBitSet(pev->spawnflags, SF_XEN_PLANT_DROP_TO_FLOOR))
+		DropToFloor();
 }
 
 

diff --git a/dlls/monster/CXenPLight.cpp b/dlls/monster/CXenPLight.cpp
@@ -4,7 +4,7 @@
 #include "effects.h"
 #include "CActAnimating.h"
 
-#define SF_XEN_PLATN_LIGHT_IGNORE_PLAYER 64
+#define SF_XEN_PLANT_LIGHT_IGNORE_PLAYER 64
 
 #define XEN_PLANT_GLOW_SPRITE		"sprites/flare3.spr"
 #define XEN_PLANT_HIDE_TIME			5
@@ -49,6 +49,12 @@ void CXenPLight::Spawn(void)
 	SetActivity(ACT_IDLE);
 	pev->nextthink = gpGlobals->time + 0.1;
 	pev->frame = RANDOM_FLOAT(0, 255);
+
+	if (FBitSet(pev->spawnflags, SF_XEN_PLANT_DROP_TO_FLOOR))
+		DropToFloor();
+
+	if (FBitSet(pev->flags, FL_KILLME))
+		return;
 
 	m_pGlow = CSprite::SpriteCreate(XEN_PLANT_GLOW_SPRITE, pev->origin + Vector(0, 0, (pev->mins.z + pev->maxs.z) * 0.5), FALSE);
 	m_pGlow->SetTransparency(kRenderGlow, pev->rendercolor.x, pev->rendercolor.y, pev->rendercolor.z, pev->renderamt, pev->renderfx);
@@ -100,7 +106,7 @@ void CXenPLight::Think(void)
 
 void CXenPLight::Touch(CBaseEntity* pOther)
 {
-	if( !FBitSet(pev->spawnflags, SF_XEN_PLATN_LIGHT_IGNORE_PLAYER) && pOther->IsPlayer() )
+	if( !FBitSet(pev->spawnflags, SF_XEN_PLANT_LIGHT_IGNORE_PLAYER) && pOther->IsPlayer() )
 	{
 		pev->dmgtime = gpGlobals->time + XEN_PLANT_HIDE_TIME;
 		if (GetActivity() == ACT_IDLE || GetActivity() == ACT_STAND)

diff --git a/dlls/monster/CXenSpore.cpp b/dlls/monster/CXenSpore.cpp
@@ -129,6 +129,9 @@ void CXenSpore::Spawn(void)
 	pev->framerate = RANDOM_FLOAT(0.7, 1.4);
 	ResetSequenceInfo();
 	pev->nextthink = gpGlobals->time + RANDOM_FLOAT(0.1, 0.4);	// Load balance these a bit
+
+	if (FBitSet(pev->spawnflags, SF_XEN_PLANT_DROP_TO_FLOOR))
+		DropToFloor();
 }
 
 const char* CXenSpore::pModelNames[] =

diff --git a/dlls/monster/CXenTree.cpp b/dlls/monster/CXenTree.cpp
@@ -85,6 +85,12 @@ void CXenTree::Spawn(void)
 	pev->frame = RANDOM_FLOAT(0, 255);
 	pev->framerate = RANDOM_FLOAT(0.7, 1.4);
 
+	if (FBitSet(pev->spawnflags, SF_XEN_PLANT_DROP_TO_FLOOR))
+		DropToFloor();
+
+	if (FBitSet(pev->flags, FL_KILLME))
+		return;
+
 	Vector triggerPosition;
 	UTIL_MakeVectorsPrivate(pev->angles, triggerPosition, NULL, NULL);
 	triggerPosition = pev->origin + (triggerPosition * 64);