Merge pull request mapbase-source#192 from samisalreadytaken/scripthooks

Script hooks fixes and script hook manager
Project-P2009 · Jul 23, 2022 · 9d2a6b8 · 9d2a6b8
2 parents a9c9567 + e05b418
commit 9d2a6b8
Show file tree

Hide file tree

Showing 12 changed files with 481 additions and 193 deletions.
diff --git a/sp/src/game/client/c_baseentity.cpp b/sp/src/game/client/c_baseentity.cpp
@@ -1353,7 +1353,7 @@ void C_BaseEntity::Term()
  if ( m_hScriptInstance )
  {
 #ifdef MAPBASE_VSCRIPT
- if ( m_ScriptScope.IsInitialized() )
+ if ( m_ScriptScope.IsInitialized() && g_Hook_UpdateOnRemove.CanRunInScope( m_ScriptScope ) )
  {
  g_Hook_UpdateOnRemove.Call( m_ScriptScope, NULL, NULL );
  }

diff --git a/sp/src/game/client/vscript_client.cpp b/sp/src/game/client/vscript_client.cpp
@@ -114,7 +114,7 @@ class CScriptClientEntityIterator : public IClientEntityListener
 
  void OnEntityCreated( CBaseEntity *pEntity )
  {
- if ( g_pScriptVM )
+ if ( g_pScriptVM && GetScriptHookManager().IsEventHooked( "OnEntityCreated" ) )
  {
  // entity
  ScriptVariant_t args[] = { ScriptVariant_t( pEntity->GetScriptInstance() ) };
@@ -124,7 +124,7 @@ class CScriptClientEntityIterator : public IClientEntityListener
 
  void OnEntityDeleted( CBaseEntity *pEntity )
  {
- if ( g_pScriptVM )
+ if ( g_pScriptVM && GetScriptHookManager().IsEventHooked( "OnEntityDeleted" ) )
  {
  // entity
  ScriptVariant_t args[] = { ScriptVariant_t( pEntity->GetScriptInstance() ) };
@@ -645,6 +645,11 @@ bool VScriptClientInit()
 #else
  Log( "VSCRIPT: Started VScript virtual machine using script language '%s'\n", g_pScriptVM->GetLanguageName() );
 #endif
+
+#ifdef MAPBASE_VSCRIPT
+ GetScriptHookManager().OnInit();
+#endif
+
  ScriptRegisterFunction( g_pScriptVM, GetMapName, "Get the name of the map.");
  ScriptRegisterFunction( g_pScriptVM, Time, "Get the current server time" );
  ScriptRegisterFunction( g_pScriptVM, DoUniqueString, SCRIPT_ALIAS( "UniqueString", "Generate a string guaranteed to be unique across the life of the script VM, with an optional root string." ) );
@@ -770,6 +775,8 @@ class CVScriptGameSystem : public CAutoGameSystemPerFrame
  {
 #ifdef MAPBASE_VSCRIPT
  g_ScriptNetMsg->LevelShutdownPreVM();
+
+ GetScriptHookManager().OnShutdown();
 #endif
  VScriptClientTerm();
  }

diff --git a/sp/src/game/server/baseentity.cpp b/sp/src/game/server/baseentity.cpp
@@ -2646,7 +2646,7 @@ void CBaseEntity::UpdateOnRemove( void )
  if ( m_hScriptInstance )
  {
 #ifdef MAPBASE_VSCRIPT
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_UpdateOnRemove.CanRunInScope( m_ScriptScope ) )
  {
  g_Hook_UpdateOnRemove.Call( m_ScriptScope, NULL, NULL );
  }

diff --git a/sp/src/game/server/filters.cpp b/sp/src/game/server/filters.cpp
@@ -2157,7 +2157,7 @@ class CFilterScript : public CBaseFilter
 public:
  bool PassesFilterImpl( CBaseEntity *pCaller, CBaseEntity *pEntity )
  {
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_PassesFilter.CanRunInScope( m_ScriptScope ) )
  {
  // caller, activator
  ScriptVariant_t functionReturn;
@@ -2176,7 +2176,7 @@ class CFilterScript : public CBaseFilter
 
  bool PassesDamageFilterImpl( CBaseEntity *pCaller, const CTakeDamageInfo &info )
  {
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_PassesDamageFilter.CanRunInScope( m_ScriptScope ) )
  {
  HSCRIPT pInfo = g_pScriptVM->RegisterInstance( const_cast<CTakeDamageInfo*>(&info) );
 
@@ -2201,7 +2201,7 @@ class CFilterScript : public CBaseFilter
 
  bool PassesFinalDamageFilter( CBaseEntity *pCaller, const CTakeDamageInfo &info )
  {
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_PassesFinalDamageFilter.CanRunInScope( m_ScriptScope ) )
  {
  HSCRIPT pInfo = g_pScriptVM->RegisterInstance( const_cast<CTakeDamageInfo*>(&info) );
 
@@ -2225,7 +2225,7 @@ class CFilterScript : public CBaseFilter
 
  bool BloodAllowed( CBaseEntity *pCaller, const CTakeDamageInfo &info )
  {
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_BloodAllowed.CanRunInScope( m_ScriptScope ) )
  {
  HSCRIPT pInfo = g_pScriptVM->RegisterInstance( const_cast<CTakeDamageInfo*>(&info) );
 
@@ -2249,7 +2249,7 @@ class CFilterScript : public CBaseFilter
 
  bool DamageMod( CBaseEntity *pCaller, CTakeDamageInfo &info )
  {
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_DamageMod.CanRunInScope( m_ScriptScope ) )
  {
  HSCRIPT pInfo = g_pScriptVM->RegisterInstance( &info );
 

diff --git a/sp/src/game/server/vscript_server.cpp b/sp/src/game/server/vscript_server.cpp
@@ -154,7 +154,7 @@ class CScriptEntityIterator : public IEntityListener
 
  void OnEntityCreated( CBaseEntity *pEntity )
  {
- if ( g_pScriptVM )
+ if ( g_pScriptVM && GetScriptHookManager().IsEventHooked( "OnEntityCreated" ) )
  {
  // entity
  ScriptVariant_t args[] = { ScriptVariant_t( pEntity->GetScriptInstance() ) };
@@ -164,7 +164,7 @@ class CScriptEntityIterator : public IEntityListener
 
  void OnEntitySpawned( CBaseEntity *pEntity )
  {
- if ( g_pScriptVM )
+ if ( g_pScriptVM && GetScriptHookManager().IsEventHooked( "OnEntitySpawned" ) )
  {
  // entity
  ScriptVariant_t args[] = { ScriptVariant_t( pEntity->GetScriptInstance() ) };
@@ -174,7 +174,7 @@ class CScriptEntityIterator : public IEntityListener
 
  void OnEntityDeleted( CBaseEntity *pEntity )
  {
- if ( g_pScriptVM )
+ if ( g_pScriptVM && GetScriptHookManager().IsEventHooked( "OnEntityDeleted" ) )
  {
  // entity
  ScriptVariant_t args[] = { ScriptVariant_t( pEntity->GetScriptInstance() ) };
@@ -600,6 +600,10 @@ bool VScriptServerInit()
  Log( "VSCRIPT: Started VScript virtual machine using script language '%s'\n", g_pScriptVM->GetLanguageName() );
 #endif
 
+#ifdef MAPBASE_VSCRIPT
+ GetScriptHookManager().OnInit();
+#endif
+
 #ifdef MAPBASE_VSCRIPT
  // MULTIPLAYER
  // ScriptRegisterFunctionNamed( g_pScriptVM, UTIL_PlayerByIndex, "GetPlayerByIndex", "PlayerInstanceFromIndex" );
@@ -836,6 +840,8 @@ class CVScriptGameSystem : public CAutoGameSystemPerFrame
  {
 #ifdef MAPBASE_VSCRIPT
  g_ScriptNetMsg->LevelShutdownPreVM();
+
+ GetScriptHookManager().OnShutdown();
 #endif
  VScriptServerTerm();
  }

diff --git a/sp/src/game/shared/baseentity_shared.cpp b/sp/src/game/shared/baseentity_shared.cpp
@@ -1613,7 +1613,7 @@ typedef CTraceFilterSimpleList CBulletsTraceFilter;
 void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )
 {
 #if defined(MAPBASE_VSCRIPT) && defined(GAME_DLL)
- if (m_ScriptScope.IsInitialized())
+ if ( m_ScriptScope.IsInitialized() && g_Hook_FireBullets.CanRunInScope( m_ScriptScope ) )
  {
  HSCRIPT hInfo = g_pScriptVM->RegisterInstance( const_cast<FireBulletsInfo_t*>(&info) );
 

diff --git a/sp/src/game/shared/mapbase/vscript_singletons.cpp b/sp/src/game/shared/mapbase/vscript_singletons.cpp
@@ -872,7 +872,8 @@ class CScriptSaveRestoreUtil : public CAutoGameSystem
  {
  if ( g_pScriptVM )
  {
- g_Hook_OnSave.Call( NULL, NULL, NULL );
+ if ( GetScriptHookManager().IsEventHooked( "OnSave" ) )
+ g_Hook_OnSave.Call( NULL, NULL, NULL );
 
  // Legacy hook
  HSCRIPT hFunc = g_pScriptVM->LookupFunction( "OnSave" );
@@ -893,7 +894,8 @@ class CScriptSaveRestoreUtil : public CAutoGameSystem
  {
  if ( g_pScriptVM )
  {
- g_Hook_OnRestore.Call( NULL, NULL, NULL );
+ if ( GetScriptHookManager().IsEventHooked( "OnRestore" ) )
+ g_Hook_OnRestore.Call( NULL, NULL, NULL );
 
  // Legacy hook
  HSCRIPT hFunc = g_pScriptVM->LookupFunction( "OnRestore" );

diff --git a/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp b/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp
@@ -177,8 +177,13 @@ CWeaponCustomScripted::CWeaponCustomScripted()
 
 bool CWeaponCustomScripted::RunWeaponHook( ScriptHook_t &hook, HSCRIPT &cached, ScriptVariant_t *retVal, ScriptVariant_t *pArgs )
 {
- if (!hook.CheckFuncValid(cached))
- cached = hook.CanRunInScope(m_ScriptScope);
+ if ( !cached )
+ {
+ if ( hook.CanRunInScope( m_ScriptScope ) )
+ {
+ cached = hook.m_hFunc;
+ }
+ }
 
  if (cached)
  {

diff --git a/sp/src/game/shared/vscript_shared.cpp b/sp/src/game/shared/vscript_shared.cpp
@@ -451,6 +451,10 @@ class CVScriptSaveRestoreBlockHandler : public CDefSaveRestoreBlockHandler
  }
  m_InstanceMap.Purge();
 
+#ifdef MAPBASE_VSCRIPT
+ GetScriptHookManager().OnRestore();
+#endif
+
 #if defined(MAPBASE_VSCRIPT) && defined(CLIENT_DLL)
  VScriptSaveRestoreUtil_OnVMRestore();
 #endif