VScript leak fixes

sp/src/game/client/c_baseanimating.cpp

@@ -1531,35 +1531,32 @@ float C_BaseAnimating::ClampCycle( float flCycle, bool isLooping )
 //-----------------------------------------------------------------------------
 const Vector& C_BaseAnimating::ScriptGetAttachmentOrigin( int iAttachment )
 {	
-
 	static Vector absOrigin;
-	static QAngle qa;
+	QAngle qa;
 
 	C_BaseAnimating::GetAttachment( iAttachment, absOrigin, qa );
 
 	return absOrigin;
 }
 
-const Vector& C_BaseAnimating::ScriptGetAttachmentAngles( int iAttachment )
+const QAngle& C_BaseAnimating::ScriptGetAttachmentAngles( int iAttachment )
 {	
-
-	static Vector absOrigin;
-	static Vector absAngles;
 	static QAngle qa;
+	Vector absOrigin;
 
 	C_BaseAnimating::GetAttachment( iAttachment, absOrigin, qa );
-	absAngles.x = qa.x;
-	absAngles.y = qa.y;
-	absAngles.z = qa.z;
-	return absAngles;
+	return qa;
 }
 
-HSCRIPT C_BaseAnimating::ScriptGetAttachmentMatrix( int iAttachment )
+HSCRIPT_RC C_BaseAnimating::ScriptGetAttachmentMatrix( int iAttachment )
 {	
-	static matrix3x4_t matrix;
+	matrix3x4_t *matrix = new matrix3x4_t;
+
+	if ( C_BaseAnimating::GetAttachment( iAttachment, *matrix ) )
+		return g_pScriptVM->RegisterInstance( matrix, true );
 
-	C_BaseAnimating::GetAttachment( iAttachment, matrix );
-	return g_pScriptVM->RegisterInstance( &matrix );
+	delete matrix;
+	return NULL;
 }
 
 void C_BaseAnimating::ScriptGetBoneTransform( int iBone, HSCRIPT hTransform )

sp/src/game/client/c_baseanimating.h

@@ -464,8 +464,8 @@ class C_BaseAnimating : public C_BaseEntity, private IModelLoadCallback
 #ifdef MAPBASE_VSCRIPT
 	int		ScriptLookupAttachment( const char *pAttachmentName ) { return LookupAttachment( pAttachmentName ); }
 	const Vector& ScriptGetAttachmentOrigin(int iAttachment);
-	const Vector& ScriptGetAttachmentAngles(int iAttachment);
-	HSCRIPT ScriptGetAttachmentMatrix(int iAttachment);
+	const QAngle& ScriptGetAttachmentAngles(int iAttachment);
+	HSCRIPT_RC ScriptGetAttachmentMatrix(int iAttachment);
 
 	void	ScriptGetBoneTransform( int iBone, HSCRIPT hTransform );
 	void	ScriptSetBoneTransform( int iBone, HSCRIPT hTransform );

sp/src/game/client/mapbase/vscript_vgui.cpp

@@ -2610,9 +2610,17 @@ CLASS_HELPER_INTERFACE( PNGImage, Panel )
 
 static inline void SetHScript( HSCRIPT &var, HSCRIPT val )
 {
-	if ( var && g_pScriptVM )
-		g_pScriptVM->ReleaseScript( var );
-	var = val;
+	if ( g_pScriptVM )
+	{
+		if ( var )
+			g_pScriptVM->ReleaseScript( var );
+
+		var = g_pScriptVM->CopyObject( val );
+	}
+	else
+	{
+		var = NULL;
+	}
 }
 
 #define CheckCallback(s)\

sp/src/game/server/baseanimating.cpp

@@ -317,7 +317,7 @@ BEGIN_ENT_SCRIPTDESC( CBaseAnimating, CBaseEntity, "Animating models" )
 	DEFINE_SCRIPTFUNC_NAMED( ScriptGetSequenceActivity, "GetSequenceActivity", "Gets the activity ID of the specified sequence index" )
 	DEFINE_SCRIPTFUNC_NAMED( ScriptSelectWeightedSequence, "SelectWeightedSequence", "Selects a sequence for the specified activity ID" )
 	DEFINE_SCRIPTFUNC_NAMED( ScriptSelectHeaviestSequence, "SelectHeaviestSequence", "Selects the sequence with the heaviest weight for the specified activity ID" )
-	DEFINE_SCRIPTFUNC_NAMED( ScriptGetSequenceKeyValues, "GetSequenceKeyValues", "Get a KeyValue class instance on the specified sequence. WARNING: This uses the same KeyValue pointer as GetModelKeyValues!" )
+	DEFINE_SCRIPTFUNC_NAMED( ScriptGetSequenceKeyValues, "GetSequenceKeyValues", "Get a KeyValue class instance on the specified sequence" )
 	DEFINE_SCRIPTFUNC( ResetSequenceInfo, "" )
 	DEFINE_SCRIPTFUNC( StudioFrameAdvance, "" )
 	DEFINE_SCRIPTFUNC( GetPlaybackRate, "" )
@@ -2306,21 +2306,14 @@ void CBaseAnimating::ScriptGetBoneTransform( int iBone, HSCRIPT hTransform )
 
 //-----------------------------------------------------------------------------
 // VScript access to sequence's key values
-// for iteration and value access, use:
-//	ScriptFindKey, ScriptGetFirstSubKey, ScriptGetString, 
-//	ScriptGetInt, ScriptGetFloat, ScriptGetNextKey
-// NOTE: This is recycled from ScriptGetModelKeyValues() and uses its pointer!!!
 //-----------------------------------------------------------------------------
-HSCRIPT CBaseAnimating::ScriptGetSequenceKeyValues( int iSequence )
+HSCRIPT_RC CBaseAnimating::ScriptGetSequenceKeyValues( int iSequence )
 {
 	KeyValues *pSeqKeyValues = GetSequenceKeyValues( iSequence );
 	HSCRIPT hScript = NULL;
 	if ( pSeqKeyValues )
 	{
-		// UNDONE: how does destructor get called on this
-		m_pScriptModelKeyValues = hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pSeqKeyValues, true );
-
-		// UNDONE: who calls ReleaseInstance on this??? Does name need to be unique???
+		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pSeqKeyValues );
 	}
 
 	return hScript;

sp/src/game/server/baseanimating.h

@@ -211,7 +211,7 @@ class CBaseAnimating : public CBaseEntity
 	int		ScriptSelectHeaviestSequence( int activity ) { return SelectHeaviestSequence( (Activity)activity ); }
 	int		ScriptSelectWeightedSequence( int activity, int curSequence ) { return SelectWeightedSequence( (Activity)activity, curSequence ); }
 
-	HSCRIPT ScriptGetSequenceKeyValues( int iSequence );
+	HSCRIPT_RC ScriptGetSequenceKeyValues( int iSequence );
 
 	// For VScript
 	int		GetSkin() { return m_nSkin; }

sp/src/game/server/baseentity.cpp

@@ -10153,7 +10153,7 @@ void CBaseEntity::SetScriptOwnerEntity(HSCRIPT pOwner)
 //	ScriptFindKey, ScriptGetFirstSubKey, ScriptGetString, 
 //	ScriptGetInt, ScriptGetFloat, ScriptGetNextKey
 //-----------------------------------------------------------------------------
-HSCRIPT CBaseEntity::ScriptGetModelKeyValues( void )
+HSCRIPT_RC CBaseEntity::ScriptGetModelKeyValues( void )
 {
 	KeyValues *pModelKeyValues = new KeyValues("");
 	HSCRIPT hScript = NULL;
@@ -10162,16 +10162,12 @@ HSCRIPT CBaseEntity::ScriptGetModelKeyValues( void )
 
 	if ( pModelKeyValues->LoadFromBuffer( pszModelName, pBuffer ) )
 	{
-		// UNDONE: how does destructor get called on this
 #ifdef MAPBASE_VSCRIPT
-		m_pScriptModelKeyValues = hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pModelKeyValues, true ); // Allow VScript to delete this when the instance is removed.
+		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pModelKeyValues );
 #else
+		// UNDONE: how does destructor get called on this
 		m_pScriptModelKeyValues = new CScriptKeyValues( pModelKeyValues );
-#endif
-
 		// UNDONE: who calls ReleaseInstance on this??? Does name need to be unique???
-
-#ifndef MAPBASE_VSCRIPT
 		hScript = g_pScriptVM->RegisterInstance( m_pScriptModelKeyValues );
 #endif
 

sp/src/game/server/baseentity.h

@@ -2114,7 +2114,7 @@ class CBaseEntity : public IServerEntity
 #endif
 
 	const char* ScriptGetModelName(void) const;
-	HSCRIPT ScriptGetModelKeyValues(void);
+	HSCRIPT_RC ScriptGetModelKeyValues(void);
 
 	void ScriptStopSound(const char* soundname);
 	void ScriptEmitSound(const char* soundname);
@@ -2188,9 +2188,7 @@ class CBaseEntity : public IServerEntity
 	CScriptScope	m_ScriptScope;
 	HSCRIPT			m_hScriptInstance;
 	string_t		m_iszScriptId;
-#ifdef MAPBASE_VSCRIPT
-	HSCRIPT			m_pScriptModelKeyValues;
-#else
+#ifndef MAPBASE_VSCRIPT
 	CScriptKeyValues* m_pScriptModelKeyValues;
 #endif
 };

sp/src/game/server/mapbase/logic_externaldata.cpp

@@ -38,8 +38,8 @@ class CLogicExternalData : public CLogicalEntity
 	void InputReload( inputdata_t &inputdata );
 
 #ifdef MAPBASE_VSCRIPT
-	HSCRIPT			ScriptGetKeyValues( void );
-	HSCRIPT			ScriptGetKeyValueBlock( void );
+	HSCRIPT_RC			ScriptGetKeyValues( void );
+	HSCRIPT_RC			ScriptGetKeyValueBlock( void );
 
 	void			ScriptSetKeyValues( HSCRIPT hKV );
 	void			ScriptSetKeyValueBlock( HSCRIPT hKV );
@@ -275,33 +275,35 @@ void CLogicExternalData::InputReload( inputdata_t &inputdata )
 #ifdef MAPBASE_VSCRIPT
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-HSCRIPT CLogicExternalData::ScriptGetKeyValues( void )
+HSCRIPT_RC CLogicExternalData::ScriptGetKeyValues( void )
 {
 	if (m_bReloadBeforeEachAction)
 		LoadFile();
 
 	HSCRIPT hScript = NULL;
 	if (m_pRoot)
 	{
-		// Does this need to be destructed or freed? m_pScriptModelKeyValues apparently doesn't.
-		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, m_pRoot, false );
+		KeyValues *pCopy = new KeyValues( NULL );
+		*pCopy = *m_pRoot;
+		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pCopy );
 	}
 
 	return hScript;
 }
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-HSCRIPT CLogicExternalData::ScriptGetKeyValueBlock( void )
+HSCRIPT_RC CLogicExternalData::ScriptGetKeyValueBlock( void )
 {
 	if (m_bReloadBeforeEachAction)
 		LoadFile();
 
 	HSCRIPT hScript = NULL;
 	if (m_pBlock)
 	{
-		// Does this need to be destructed or freed? m_pScriptModelKeyValues apparently doesn't.
-		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, m_pBlock, false );
+		KeyValues *pCopy = new KeyValues( NULL );
+		*pCopy = *m_pBlock;
+		hScript = scriptmanager->CreateScriptKeyValues( g_pScriptVM, pCopy );
 	}
 
 	return hScript;
@@ -321,7 +323,8 @@ void CLogicExternalData::ScriptSetKeyValues( HSCRIPT hKV )
 	KeyValues *pKV = scriptmanager->GetKeyValuesFromScriptKV( g_pScriptVM, hKV );
 	if (pKV)
 	{
-		m_pRoot = pKV;
+		m_pRoot = new KeyValues( NULL );
+		*m_pRoot = *pKV;
 	}
 }
 
@@ -336,7 +339,8 @@ void CLogicExternalData::ScriptSetKeyValueBlock( HSCRIPT hKV )
 	KeyValues *pKV = scriptmanager->GetKeyValuesFromScriptKV( g_pScriptVM, hKV );
 	if (pKV)
 	{
-		m_pBlock = pKV;
+		m_pBlock = new KeyValues( NULL );
+		*m_pBlock = *pKV;
 	}
 }
 

sp/src/game/shared/baseentity_shared.cpp

@@ -3033,7 +3033,7 @@ void CBaseEntity::ScriptSetContextThink( const char* szContext, HSCRIPT hFunc, f
 
 		float nextthink = gpGlobals->curtime + flTime;
 
-		pf->m_hfnThink = hFunc;
+		pf->m_hfnThink = g_pScriptVM->CopyObject( hFunc );
 		pf->m_flNextThink = nextthink;
 
 #ifdef GAME_DLL

sp/src/game/shared/mapbase/vscript_funcs_shared.cpp

@@ -255,26 +255,19 @@ void ScriptDispatchSpawn( HSCRIPT hEntity )
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-static HSCRIPT CreateDamageInfo( HSCRIPT hInflictor, HSCRIPT hAttacker, const Vector &vecForce, const Vector &vecDamagePos, float flDamage, int iDamageType )
+static HSCRIPT_RC CreateDamageInfo( HSCRIPT hInflictor, HSCRIPT hAttacker, const Vector &vecForce, const Vector &vecDamagePos, float flDamage, int iDamageType )
 {
-	// The script is responsible for deleting this via DestroyDamageInfo().
 	CTakeDamageInfo *damageInfo = new CTakeDamageInfo( ToEnt(hInflictor), ToEnt(hAttacker), flDamage, iDamageType );
-	HSCRIPT hScript = g_pScriptVM->RegisterInstance( damageInfo );
+	HSCRIPT hScript = g_pScriptVM->RegisterInstance( damageInfo, true );
 
 	damageInfo->SetDamagePosition( vecDamagePos );
 	damageInfo->SetDamageForce( vecForce );
 
 	return hScript;
 }
 
-static void DestroyDamageInfo( HSCRIPT hDamageInfo )
+static void DestroyDamageInfo( HSCRIPT )
 {
-	CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( hDamageInfo );
-	if ( pInfo )
-	{
-		g_pScriptVM->RemoveInstance( hDamageInfo );
-		delete pInfo;
-	}
 }
 
 void ScriptCalculateExplosiveDamageForce( HSCRIPT info, const Vector &vecDir, const Vector &vecForceOrigin, float flScale )
@@ -317,6 +310,8 @@ void ScriptGuessDamageForce( HSCRIPT info, const Vector &vecForceDir, const Vect
 //
 //-----------------------------------------------------------------------------
 BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptGameTrace, "CGameTrace", "trace_t" )
+	DEFINE_SCRIPT_REFCOUNTED_INSTANCE()
+
 	DEFINE_SCRIPTFUNC( DidHitWorld, "Returns whether the trace hit the world entity or not." )
 	DEFINE_SCRIPTFUNC( DidHitNonWorldEntity, "Returns whether the trace hit something other than the world entity." )
 	DEFINE_SCRIPTFUNC( GetEntityIndex, "Returns the index of whatever entity this trace hit." )
@@ -347,7 +342,7 @@ BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptGameTrace, "CGameTrace", "trace_t" )
 	DEFINE_SCRIPTFUNC( Surface, "" )
 	DEFINE_SCRIPTFUNC( Plane, "" )
 
-	DEFINE_SCRIPTFUNC( Destroy, "Deletes this instance. Important for preventing memory leaks." )
+	DEFINE_SCRIPTFUNC( Destroy, SCRIPT_HIDE )
 END_SCRIPTDESC();
 
 BEGIN_SCRIPTDESC_ROOT_NAMED( scriptsurfacedata_t, "surfacedata_t", "" )
@@ -379,33 +374,25 @@ CPlaneTInstanceHelper g_PlaneTInstanceHelper;
 BEGIN_SCRIPTDESC_ROOT_WITH_HELPER( cplane_t, "", &g_PlaneTInstanceHelper )
 END_SCRIPTDESC();
 
-static HSCRIPT ScriptTraceLineComplex( const Vector &vecStart, const Vector &vecEnd, HSCRIPT entIgnore, int iMask, int iCollisionGroup )
+static HSCRIPT_RC ScriptTraceLineComplex( const Vector &vecStart, const Vector &vecEnd, HSCRIPT entIgnore, int iMask, int iCollisionGroup )
 {
-	// The script is responsible for deleting this via Destroy().
 	CScriptGameTrace *tr = new CScriptGameTrace();
 
 	CBaseEntity *pIgnore = ToEnt( entIgnore );
 	UTIL_TraceLine( vecStart, vecEnd, iMask, pIgnore, iCollisionGroup, tr );
 
-	tr->RegisterSurface();
-	tr->RegisterPlane();
-
-	return tr->GetScriptInstance();
+	return g_pScriptVM->RegisterInstance( tr, true );
 }
 
-static HSCRIPT ScriptTraceHullComplex( const Vector &vecStart, const Vector &vecEnd, const Vector &hullMin, const Vector &hullMax,
+static HSCRIPT_RC ScriptTraceHullComplex( const Vector &vecStart, const Vector &vecEnd, const Vector &hullMin, const Vector &hullMax,
 	HSCRIPT entIgnore, int iMask, int iCollisionGroup )
 {
-	// The script is responsible for deleting this via Destroy().
 	CScriptGameTrace *tr = new CScriptGameTrace();
 
 	CBaseEntity *pIgnore = ToEnt( entIgnore );
 	UTIL_TraceHull( vecStart, vecEnd, hullMin, hullMax, iMask, pIgnore, iCollisionGroup, tr );
 
-	tr->RegisterSurface();
-	tr->RegisterPlane();
-
-	return tr->GetScriptInstance();
+	return g_pScriptVM->RegisterInstance( tr, true );
 }
 
 //-----------------------------------------------------------------------------
@@ -476,12 +463,11 @@ void FireBulletsInfo_t::ScriptSetAdditionalIgnoreEnt( HSCRIPT value )
 	m_pAdditionalIgnoreEnt = ToEnt( value );
 }
 
-static HSCRIPT CreateFireBulletsInfo( int cShots, const Vector &vecSrc, const Vector &vecDirShooting,
+static HSCRIPT_RC CreateFireBulletsInfo( int cShots, const Vector &vecSrc, const Vector &vecDirShooting,
 	const Vector &vecSpread, float iDamage, HSCRIPT pAttacker )
 {
-	// The script is responsible for deleting this via DestroyFireBulletsInfo().
 	FireBulletsInfo_t *info = new FireBulletsInfo_t();
-	HSCRIPT hScript = g_pScriptVM->RegisterInstance( info );
+	HSCRIPT hScript = g_pScriptVM->RegisterInstance( info, true );
 
 	info->SetShots( cShots );
 	info->SetSource( vecSrc );
@@ -493,14 +479,8 @@ static HSCRIPT CreateFireBulletsInfo( int cShots, const Vector &vecSrc, const Ve
 	return hScript;
 }
 
-static void DestroyFireBulletsInfo( HSCRIPT hBulletsInfo )
+static void DestroyFireBulletsInfo( HSCRIPT )
 {
-	FireBulletsInfo_t *pInfo = HScriptToClass< FireBulletsInfo_t >( hBulletsInfo );
-	if ( pInfo )
-	{
-		g_pScriptVM->RemoveInstance( hBulletsInfo );
-		delete pInfo;
-	}
 }
 
 //-----------------------------------------------------------------------------
@@ -1053,14 +1033,14 @@ void RegisterSharedScriptFunctions()
 #endif
 
 	ScriptRegisterFunction( g_pScriptVM, CreateDamageInfo, "" );
-	ScriptRegisterFunction( g_pScriptVM, DestroyDamageInfo, "" );
+	ScriptRegisterFunction( g_pScriptVM, DestroyDamageInfo, SCRIPT_HIDE );
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptCalculateExplosiveDamageForce, "CalculateExplosiveDamageForce", "Fill out a damage info handle with a damage force for an explosive." );
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptCalculateBulletDamageForce, "CalculateBulletDamageForce", "Fill out a damage info handle with a damage force for a bullet impact." );
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptCalculateMeleeDamageForce, "CalculateMeleeDamageForce", "Fill out a damage info handle with a damage force for a melee impact." );
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptGuessDamageForce, "GuessDamageForce", "Try and guess the physics force to use." );
 
 	ScriptRegisterFunction( g_pScriptVM, CreateFireBulletsInfo, "" );
-	ScriptRegisterFunction( g_pScriptVM, DestroyFireBulletsInfo, "" );
+	ScriptRegisterFunction( g_pScriptVM, DestroyFireBulletsInfo, SCRIPT_HIDE );
 
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptTraceLineComplex, "TraceLineComplex", "Complex version of TraceLine which takes 2 points, an ent to ignore, a trace mask, and a collision group. Returns a handle which can access all trace info." );
 	ScriptRegisterFunctionNamed( g_pScriptVM, ScriptTraceHullComplex, "TraceHullComplex", "Takes 2 points, min/max hull bounds, an ent to ignore, a trace mask, and a collision group to trace to a point using a hull. Returns a handle which can access all trace info." );