Implement ValveSoftware#1525

Author: Bitl

game/quiver/info_changelog.txt

@@ -79,6 +79,8 @@ Added the following Source SDK Pull Requests:
 	- #1520: Add ForceDifficultyBasedAim CTFBot flag to allow MvM missions to let Spies aim better
 	- #1522: Fix Thermal Thruster particles
 	- #1524: Fix Eureka Effect menu reopening
+	- #1526: Fix Client Crashes from Invalid Banner model indexes
+	- #1525: Add more functionality to Input<name>() callback in VScript
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/server/baseentity.cpp

@@ -4557,9 +4557,19 @@ bool CBaseEntity::AcceptInput( const char *szInputName, CBaseEntity *pActivator,
 							g_pScriptVM->SetValue( "activator", ( pActivator ) ? ScriptVariant_t( pActivator->GetScriptInstance() ) : SCRIPT_VARIANT_NULL );
 							g_pScriptVM->SetValue( "caller", ( pCaller ) ? ScriptVariant_t( pCaller->GetScriptInstance() ) : SCRIPT_VARIANT_NULL );
 
+#ifdef BDSBASE
+							g_pScriptVM->SetValue("input_value", Value.String());
+#endif
+
 							if( CallScriptFunction( szScriptFunctionName, &functionReturn ) )
 							{
 								bCallInputFunc = functionReturn;
+#ifdef BDSBASE
+								// Allow reassignment of activator and caller of the input
+								IScriptVM* pVM = g_pScriptVM;
+								pVM->IfHas<HSCRIPT>(m_ScriptScope, "activator", [&](HSCRIPT value) { data.pActivator = ToEnt(value); });
+								pVM->IfHas<HSCRIPT>(m_ScriptScope, "caller", [&](HSCRIPT value) { data.pCaller = ToEnt(value); });
+#endif
 							}
 						}
 
@@ -4572,6 +4582,9 @@ bool CBaseEntity::AcceptInput( const char *szInputName, CBaseEntity *pActivator,
 						{
 							g_pScriptVM->ClearValue( "activator" );
 							g_pScriptVM->ClearValue( "caller" );
+#ifdef BDSBASE
+							g_pScriptVM->ClearValue("input_value");
+#endif
 						}
 					}
 					else if ( dmap->dataDesc[i].flags & FTYPEDESC_KEY )