Try to fix some Shephard effect crashes/bugs

ScriptedSnark · Mar 30, 2024 · cf0651f · cf0651f
1 parent 2791d2a
commit cf0651f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/GSChaos/CChaos.cpp b/GSChaos/CChaos.cpp
@@ -586,7 +586,7 @@ void CChaos::OnFrame(double time)
 
 	bPaused = CLWrapper::GetPausedState();
 
-	if (bPaused || !m_bInGame)
+	if (bPaused || !m_bInGame || sv->state != ss_active)
 	{
 		if (!m_bPaused)
 		{

diff --git a/GSChaos/CFeatureExtremeGrieferShephard.cpp b/GSChaos/CFeatureExtremeGrieferShephard.cpp
@@ -90,7 +90,7 @@ void CFeatureExtremeGrieferShephard::OnFrame(double time)
 
 void CFeatureExtremeGrieferShephard::Spawn()
 {
-	if (m_pShephard)
+	if (m_pShephard && !stricmp(STRING(m_pShephard->v.classname), "chaos_exgriefer"))
 	{
 		g_engfuncs->pfnRemoveEntity(m_pShephard);
 		if (m_pShephard->pvPrivateData != NULL)
@@ -173,23 +173,9 @@ void CFeatureExtremeGrieferShephard::Restore()
 	if (!m_bSpawned)
 		return;
 
-	edict_t* e;
-	for (int i = 1; i < sv->num_edicts; i++)
-	{
-		e = ORIG_EDICT_NUM(i);
-		if (!e)
-			continue;
-
-		if (!stricmp(STRING(e->v.classname), "chaos_exgriefer"))
-		{
-			g_engfuncs->pfnRemoveEntity(e);
-			if (e->pvPrivateData != NULL)
-			{
-				FREE_PRIVATE(e);
-			}
-		}
-	}
+	if (!m_pShephard || stricmp(STRING(m_pShephard->v.classname), "chaos_exgriefer"))
+		Spawn();
 
-	Spawn();
-	m_pShephard->v.origin = m_shephardLatestOrigin;
+	if (!stricmp(STRING(m_pShephard->v.classname), "chaos_exgriefer"))
+		m_pShephard->v.origin = m_shephardLatestOrigin;
 }
diff --git a/GSChaos/CFeatureGrieferShephard.cpp b/GSChaos/CFeatureGrieferShephard.cpp
@@ -38,7 +38,7 @@ void CFeatureGrieferShephard::OnFrame(double time)
 
 void CFeatureGrieferShephard::Spawn()
 {
-	if (m_pShephard)
+	if (m_pShephard && strstr(STRING(m_pShephard->v.classname), "generic"))
 	{
 		g_engfuncs->pfnRemoveEntity(m_pShephard);
 		if (m_pShephard->pvPrivateData != NULL)