Implement ValveSoftware#1347

Bitl · Bitl · commit 89200d011f88 · 2025-06-25T10:18:55.000-07:00
diff --git a/src/game/server/baseentity.cpp b/src/game/server/baseentity.cpp
@@ -8651,7 +8651,11 @@ bool CBaseEntity::ValidateScriptScope()
 //-----------------------------------------------------------------------------
 void CBaseEntity::RunVScripts()
 {
-	if( m_iszVScripts == NULL_STRING )
+#ifdef BDSBASE
+	if (m_iszVScripts == NULL_STRING || !ValidateScriptScope())
+#else
+	if (m_iszVScripts == NULL_STRING)
+#endif
 	{
 		return;
 	}
@@ -8728,7 +8732,11 @@ void CBaseEntity::RunVScripts()
 //--------------------------------------------------------------------------------------------------
 void CBaseEntity::RunPrecacheScripts( void )
 {
-	if( m_iszVScripts == NULL_STRING )
+#ifdef BDSBASE
+	if (m_iszVScripts == NULL_STRING || !ValidateScriptScope())
+#else
+	if (m_iszVScripts == NULL_STRING)
+#endif
 	{
 		return;
 	}
@@ -8743,7 +8751,11 @@ void CBaseEntity::RunPrecacheScripts( void )
 
 void CBaseEntity::RunOnPostSpawnScripts( void )
 {
-	if( m_iszVScripts == NULL_STRING )
+#ifdef BDSBASE
+	if (m_iszVScripts == NULL_STRING || !ValidateScriptScope())
+#else
+	if (m_iszVScripts == NULL_STRING)
+#endif
 	{
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -8651,7 +8651,11 @@ bool CBaseEntity::ValidateScriptScope()`
`8651`	`8651`	`//-----------------------------------------------------------------------------`
`8652`	`8652`	`void CBaseEntity::RunVScripts()`
`8653`	`8653`	`{`
`8654`		`- if( m_iszVScripts == NULL_STRING )`
	`8654`	`+#ifdef BDSBASE`
	`8655`	`+ if (m_iszVScripts == NULL_STRING \|\| !ValidateScriptScope())`
	`8656`	`+#else`
	`8657`	`+ if (m_iszVScripts == NULL_STRING)`
	`8658`	`+#endif`
`8655`	`8659`	`{`
`8656`	`8660`	`return;`
`8657`	`8661`	`}`
`@@ -8728,7 +8732,11 @@ void CBaseEntity::RunVScripts()`
`8728`	`8732`	`//--------------------------------------------------------------------------------------------------`
`8729`	`8733`	`void CBaseEntity::RunPrecacheScripts( void )`
`8730`	`8734`	`{`
`8731`		`- if( m_iszVScripts == NULL_STRING )`
	`8735`	`+#ifdef BDSBASE`
	`8736`	`+ if (m_iszVScripts == NULL_STRING \|\| !ValidateScriptScope())`
	`8737`	`+#else`
	`8738`	`+ if (m_iszVScripts == NULL_STRING)`
	`8739`	`+#endif`
`8732`	`8740`	`{`
`8733`	`8741`	`return;`
`8734`	`8742`	`}`
`@@ -8743,7 +8751,11 @@ void CBaseEntity::RunPrecacheScripts( void )`
`8743`	`8751`
`8744`	`8752`	`void CBaseEntity::RunOnPostSpawnScripts( void )`
`8745`	`8753`	`{`
`8746`		`- if( m_iszVScripts == NULL_STRING )`
	`8754`	`+#ifdef BDSBASE`
	`8755`	`+ if (m_iszVScripts == NULL_STRING \|\| !ValidateScriptScope())`
	`8756`	`+#else`
	`8757`	`+ if (m_iszVScripts == NULL_STRING)`
	`8758`	`+#endif`
`8747`	`8759`	`{`
`8748`	`8760`	`return;`
`8749`	`8761`	`}`