From b2116d07e9038467084acc9927d358038f87ecaf Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Sun, 7 Nov 2021 07:35:28 -0600
Subject: [PATCH] Made VBSP's OnMapLoaded into a hook using the new system

---
 sp/src/utils/vbsp/map.cpp          | 6 ++----
 sp/src/utils/vbsp/vbsp.h           | 2 ++
 sp/src/utils/vbsp/vscript_vbsp.cpp | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sp/src/utils/vbsp/map.cpp b/sp/src/utils/vbsp/map.cpp
index dcb9aea5..bca929c9 100644
--- a/sp/src/utils/vbsp/map.cpp
+++ b/sp/src/utils/vbsp/map.cpp
@@ -2806,14 +2806,12 @@ bool LoadMapFile( const char *pszFileName )
 #ifdef MAPBASE_VSCRIPT
 		if ( g_pScriptVM )
 		{
-			HSCRIPT hFunc = g_pScriptVM->LookupFunction( "OnMapLoaded" );
-			if ( hFunc )
+			if (CMapFile::g_Hook_OnMapLoaded.CanRunInScope( NULL ))
 			{
 				// Use GetLoadingMap()
 				//g_pScriptVM->SetValue( "map", g_LoadingMap->GetScriptInstance() );
 
-				g_pScriptVM->Call( hFunc );
-				g_pScriptVM->ReleaseFunction( hFunc );
+				CMapFile::g_Hook_OnMapLoaded.Call( NULL, NULL, NULL );
 
 				//g_pScriptVM->ClearValue( "map" );
 			}
diff --git a/sp/src/utils/vbsp/vbsp.h b/sp/src/utils/vbsp/vbsp.h
index 3e9f44c0..e12d63d2 100644
--- a/sp/src/utils/vbsp/vbsp.h
+++ b/sp/src/utils/vbsp/vbsp.h
@@ -347,6 +347,8 @@ public:
 #ifdef MAPBASE_VSCRIPT
 	HSCRIPT				GetScriptInstance();
 
+	static ScriptHook_t	g_Hook_OnMapLoaded;
+
 	// VScript functions
 	ALLOW_SCRIPT_ACCESS();
 private:
diff --git a/sp/src/utils/vbsp/vscript_vbsp.cpp b/sp/src/utils/vbsp/vscript_vbsp.cpp
index abaa2d66..bcb94845 100644
--- a/sp/src/utils/vbsp/vscript_vbsp.cpp
+++ b/sp/src/utils/vbsp/vscript_vbsp.cpp
@@ -169,6 +169,8 @@ bool VScriptRunScript( const char *pszScriptName, HSCRIPT hScope, bool bWarnMiss
 	return bSuccess;
 }
 
+ScriptHook_t	CMapFile::g_Hook_OnMapLoaded;
+
 BEGIN_SCRIPTDESC_ROOT( CMapFile, "Map file" )
 
 	DEFINE_SCRIPTFUNC( GetMins, "Get the map's mins." )
@@ -185,6 +187,11 @@ BEGIN_SCRIPTDESC_ROOT( CMapFile, "Map file" )
 
 	DEFINE_SCRIPTFUNC( GetNumEntities, "Get the number of entities in the map." )
 
+	// 
+	// Hooks
+	// 
+	DEFINE_SIMPLE_SCRIPTHOOK( CMapFile::g_Hook_OnMapLoaded, "OnMapLoaded", FIELD_VOID, "Called when the NPC is deciding whether to hear a CSound or not." )
+
 END_SCRIPTDESC();