MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 06:45:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed activator, caller, etc. values not working within RunScriptCode and related inputs

Browse Source
This commit is contained in:
Blixibon 2022-03-09 14:14:12 -06:00
parent bb2478f342
commit e4d5d946d2
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sp/src/game/server/baseentity.cpp
View File

@ -4674,6 +4674,11 @@ bool CBaseEntity::AcceptInput( const char *szInputName, CBaseEntity *pActivator,
{ {
(this->*pfnInput)( data ); (this->*pfnInput)( data );
} }
if ( m_ScriptScope.IsInitialized() )
{
ScriptInputHookClearParams();
}
} }
else if ( dmap->dataDesc[i].flags & FTYPEDESC_KEY ) else if ( dmap->dataDesc[i].flags & FTYPEDESC_KEY )
{ {
@ -4707,6 +4712,8 @@ bool CBaseEntity::AcceptInput( const char *szInputName, CBaseEntity *pActivator,
if (functionReturn.m_bool) if (functionReturn.m_bool)
return true; return true;
} }
ScriptInputHookClearParams();
} }
#endif #endif
@ -4750,13 +4757,19 @@ bool CBaseEntity::ScriptInputHook( const char *szInputName, CBaseEntity *pActiva
bHandled = true; bHandled = true;
} }
return bHandled;
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CBaseEntity::ScriptInputHookClearParams()
{
g_pScriptVM->ClearValue( "activator" ); g_pScriptVM->ClearValue( "activator" );
g_pScriptVM->ClearValue( "caller" ); g_pScriptVM->ClearValue( "caller" );
#ifdef MAPBASE_VSCRIPT #ifdef MAPBASE_VSCRIPT
g_pScriptVM->ClearValue( "parameter" ); g_pScriptVM->ClearValue( "parameter" );
#endif #endif
return bHandled;
} }
#ifdef MAPBASE_VSCRIPT #ifdef MAPBASE_VSCRIPT

1
sp/src/game/server/baseentity.h
View File

@ -693,6 +693,7 @@ public:
#endif #endif
bool ScriptInputHook( const char *szInputName, CBaseEntity *pActivator, CBaseEntity *pCaller, variant_t Value, ScriptVariant_t &functionReturn ); bool ScriptInputHook( const char *szInputName, CBaseEntity *pActivator, CBaseEntity *pCaller, variant_t Value, ScriptVariant_t &functionReturn );
void ScriptInputHookClearParams();
#ifdef MAPBASE_VSCRIPT #ifdef MAPBASE_VSCRIPT
bool ScriptDeathHook( CTakeDamageInfo *info ); bool ScriptDeathHook( CTakeDamageInfo *info );
#endif #endif