Merge pull request #279 from samisalreadytaken/fix-weapon_custom_scripted

Blixibon · web-flow · commit f8d8cf6d2fa8 · 2024-02-04T15:27:32.000-06:00
weapon_custom_scripted fixes
diff --git a/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp b/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp
@@ -180,14 +180,15 @@ bool CWeaponCustomScripted::RunWeaponHook( ScriptHook_t &hook, HSCRIPT &cached,
 {
 	if ( !cached )
 	{
-		if ( hook.CanRunInScope( m_ScriptScope ) )
+		if ( m_ScriptScope.IsInitialized() && hook.CanRunInScope( m_ScriptScope ) )
 		{
 			cached = hook.m_hFunc;
 		}
 	}
 
 	if (cached)
 	{
+		hook.m_hFunc = cached;
 		return hook.Call( m_ScriptScope, retVal, pArgs, false );
 	}
 
@@ -328,7 +329,7 @@ void CWeaponCustomScripted::ItemPreFrame( void )
 {
 	SIMPLE_VOID_OVERRIDE( ItemPreFrame, NULL );
 
-	BaseClass::ItemPostFrame();
+	BaseClass::ItemPreFrame();
 }
 
 void CWeaponCustomScripted::ItemPostFrame( void )

Original file line number	Diff line number	Diff line change
`@@ -180,14 +180,15 @@ bool CWeaponCustomScripted::RunWeaponHook( ScriptHook_t &hook, HSCRIPT &cached,`
`180`	`180`	`{`
`181`	`181`	`if ( !cached )`
`182`	`182`	`{`
`183`		`- if ( hook.CanRunInScope( m_ScriptScope ) )`
	`183`	`+ if ( m_ScriptScope.IsInitialized() && hook.CanRunInScope( m_ScriptScope ) )`
`184`	`184`	`{`
`185`	`185`	`cached = hook.m_hFunc;`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`if (cached)`
`190`	`190`	`{`
	`191`	`+ hook.m_hFunc = cached;`
`191`	`192`	`return hook.Call( m_ScriptScope, retVal, pArgs, false );`
`192`	`193`	`}`
`193`	`194`
`@@ -328,7 +329,7 @@ void CWeaponCustomScripted::ItemPreFrame( void )`
`328`	`329`	`{`
`329`	`330`	`SIMPLE_VOID_OVERRIDE( ItemPreFrame, NULL );`
`330`	`331`
`331`		`- BaseClass::ItemPostFrame();`
	`332`	`+ BaseClass::ItemPreFrame();`
`332`	`333`	`}`
`333`	`334`
`334`	`335`	`void CWeaponCustomScripted::ItemPostFrame( void )`