Revisited hook handler based on suggestions and new information

sp/src/public/vscript/ivscript.h

@@ -889,6 +889,11 @@ public:
 	// External enums
 	//--------------------------------------------------------
 	virtual void RegisterEnum( ScriptEnumDesc_t *pEnumDesc ) = 0;
+
+	//--------------------------------------------------------
+	// External hooks
+	//--------------------------------------------------------
+	virtual void RegisterHook( ScriptHook_t *pHookDesc ) = 0;
 #endif
 
 	//--------------------------------------------------------

sp/src/vscript/vscript_squirrel.cpp

@@ -188,6 +188,11 @@ public:
 	//--------------------------------------------------------
 	virtual void RegisterEnum(ScriptEnumDesc_t *pEnumDesc) override;
 	
+	//--------------------------------------------------------
+	// External hooks
+	//--------------------------------------------------------
+	virtual void RegisterHook(ScriptHook_t *pHookDesc) override;
+
 	//--------------------------------------------------------
 	// External instances. Note class will be auto-registered.
 	//--------------------------------------------------------
@@ -2299,7 +2304,7 @@ HSCRIPT SquirrelVM::LookupHookFunction(const char *pszEventName, HSCRIPT hScope,
 	sq_pushroottable(vm_);
 	sq_pushstring(vm_, "Hooks", -1);
 	sq_get(vm_, -2);
-	sq_pushstring(vm_, "CallHooks", -1);
+	sq_pushstring(vm_, "Call", -1);
 	sq_get(vm_, -2);
 
 	HSQOBJECT obj;
@@ -2328,8 +2333,8 @@ ScriptStatus_t SquirrelVM::ExecuteHookFunction(const char *pszEventName, HSCRIPT
 	// TODO: Run in hook scope
 	sq_pushroottable(vm_);
 
-	sq_pushstring(vm_, pszEventName, -1);
 	sq_pushobject(vm_, *((HSQOBJECT*)hScope));
+	sq_pushstring(vm_, pszEventName, -1);
 
 	for (int i = 0; i < nArgs; ++i)
 	{
@@ -2602,6 +2607,17 @@ void SquirrelVM::RegisterEnum(ScriptEnumDesc_t* pEnumDesc)
 	RegisterEnumDocumentation(vm_, pEnumDesc);
 }
 
+void SquirrelVM::RegisterHook(ScriptHook_t* pHookDesc)
+{
+	SquirrelSafeCheck safeCheck(vm_);
+	Assert(pHookDesc);
+
+	if (!pHookDesc)
+		return;
+
+	RegisterHookDocumentation(vm_, pHookDesc, pHookDesc->m_desc, nullptr);
+}
+
 HSCRIPT SquirrelVM::RegisterInstance(ScriptClassDesc_t* pDesc, void* pInstance, bool bAllowDestruct)
 {
 	SquirrelSafeCheck safeCheck(vm_);

sp/src/vscript/vscript_squirrel.nut

@@ -125,90 +125,108 @@ class CSimpleCallChainer
 //---------------------------------------------------------
 // Hook handler
 //---------------------------------------------------------
-Hooks <- { Registered = {} }
+local s_List = {}
 
-function Hooks::Add( scope, event, func, name )
+Hooks <-
 {
-	Hooks.Registered[name] <- [event, scope, func];
+	// table, string, closure, string
+	function Add( scope, event, callback, context )
+	{
+		if ( typeof callback != "function" )
+			throw "invalid callback param"
+
+		if ( !(scope in s_List) )
+			s_List[scope] <- {}
+
+		local t = s_List[scope]
+
+		if ( !(event in t) )
+			t[event] <- {}
+
+		t[event][context] <- callback
 	}
 
-function Hooks::Remove( name )
+	function Remove( context, event = null )
 	{
-	Hooks.Registered.rawdelete(name);
+		if ( event )
+		{
+			foreach( k,scope in s_List )
+			{
+				if ( event in scope )
+				{
+					local t = scope[event]
+					if ( context in t )
+					{
+						delete t[context]
 					}
 
-function Hooks::ScopeHookedToEvent( scope, event )
+					// cleanup?
+					if ( !t.len() )
+						delete scope[event]
+				}
+
+				// cleanup?
+				if ( !scope.len() )
+					delete s_List[k]
+			}
+		}
+		else
 		{
-	//printl("Running ScopeHookedToEvent()")
+			foreach( k,scope in s_List )
-	foreach (elem in Hooks.Registered)
 			{
-		if (elem[1] == scope && elem[0] == event)
+				foreach( kk,ev in scope )
+				{
+					if ( context in ev )
+					{
+						delete ev[context]
+					}
+
+					// cleanup?
+					if ( !ev.len() )
+						delete scope[kk]
+				}
+
+				// cleanup?
+				if ( !scope.len() )
+					delete s_List[k]
+			}
+		}
+	}
+
+	function Call( scope, event, ... )
+	{
+		local firstReturn = null
+
+		if ( scope in s_List )
+		{
+			local t = s_List[scope]
+			if ( event in t )
+			{
+				foreach( context, callback in t[event] )
+				{
+					printf( "(%.4f) Calling hook '%s' of context '%s'\n", Time(), event, context )
+					vargv.insert(0,scope)
+
+					local curReturn = callback.acall(vargv)
+					if (firstReturn == null)
+						firstReturn = curReturn
+				}
+			}
+		}
+
+		return firstReturn
+	}
+
+	function ScopeHookedToEvent( scope, event )
+	{
+		if ( scope in s_List )
+		{
+			if (event in s_List[scope])
 				return true
 		}
+
 		return false
 	}
-
-function Hooks::CallHooks(event, scope, ...)
-{
-	//printl("vargv.len() = " + vargv.len())
-	switch (vargv.len())
-	{
-        case 0:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2]()
-			}
-			break;
-
-        case 1:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0])
-			}
-			break;
-
-        case 2:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0], vargv[1])
-			}
-			break;
-
-		case 3:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0], vargv[1], vargv[2])
-			}
-			break;
-
-        case 4:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0], vargv[1], vargv[2], vargv[3])
-			}
-			break;
-
-        case 5:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0], vargv[1], vargv[2], vargv[3], vargv[4])
-			}
-			break;
-
-		 case 6:
-			foreach (elem in Hooks.Registered)
-			{
-				if (elem[0] == event && elem[1] == scope)
-					return elem[2](vargv[0], vargv[1], vargv[2], vargv[3], vargv[4], vargv[5])
-			}
-			break;
-	}
 }
 
 //---------------------------------------------------------