MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-04-29 16:39:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Register CScriptGameTrace accessor script instances only on access

Browse Source
This commit is contained in:
samisalreadytaken 2024-11-20 15:19:57 +03:00
parent 4e68a35149
commit 2fd480704c
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sp/src/game/shared/mapbase/vscript_funcs_shared.cpp
View File

@ -381,9 +381,6 @@ static HSCRIPT_RC ScriptTraceLineComplex( const Vector &vecStart, const Vector &
CBaseEntity *pIgnore = ToEnt( entIgnore ); CBaseEntity *pIgnore = ToEnt( entIgnore );
UTIL_TraceLine( vecStart, vecEnd, iMask, pIgnore, iCollisionGroup, tr ); UTIL_TraceLine( vecStart, vecEnd, iMask, pIgnore, iCollisionGroup, tr );
tr->RegisterSurface();
tr->RegisterPlane();
return g_pScriptVM->RegisterInstance( tr, true ); return g_pScriptVM->RegisterInstance( tr, true );
} }
@ -395,9 +392,6 @@ static HSCRIPT_RC ScriptTraceHullComplex( const Vector &vecStart, const Vector &
CBaseEntity *pIgnore = ToEnt( entIgnore ); CBaseEntity *pIgnore = ToEnt( entIgnore );
UTIL_TraceHull( vecStart, vecEnd, hullMin, hullMax, iMask, pIgnore, iCollisionGroup, tr ); UTIL_TraceHull( vecStart, vecEnd, hullMin, hullMax, iMask, pIgnore, iCollisionGroup, tr );
tr->RegisterSurface();
tr->RegisterPlane();
return g_pScriptVM->RegisterInstance( tr, true ); return g_pScriptVM->RegisterInstance( tr, true );
} }

37
sp/src/game/shared/mapbase/vscript_funcs_shared.h
View File

@ -46,13 +46,15 @@ public:
class CSurfaceScriptHelper class CSurfaceScriptHelper
{ {
public: public:
// This class is owned by CScriptGameTrace, and cannot be accessed without being initialised in CScriptGameTrace::RegisterSurface() CSurfaceScriptHelper() : m_pSurface(NULL), m_hSurfaceData(NULL) {}
//CSurfaceScriptHelper() : m_pSurface(NULL), m_hSurfaceData(NULL) {}
~CSurfaceScriptHelper() ~CSurfaceScriptHelper()
{
if ( m_hSurfaceData )
{ {
g_pScriptVM->RemoveInstance( m_hSurfaceData ); g_pScriptVM->RemoveInstance( m_hSurfaceData );
} }
}
void Init( csurface_t *surf ) void Init( csurface_t *surf )
{ {
@ -113,17 +115,6 @@ public:
} }
} }
void RegisterSurface()
{
m_surfaceHelper.Init( &surface );
m_surfaceAccessor = g_pScriptVM->RegisterInstance( &m_surfaceHelper );
}
void RegisterPlane()
{
m_planeAccessor = g_pScriptVM->RegisterInstance( &plane );
}
public: public:
float FractionLeftSolid() const { return fractionleftsolid; } float FractionLeftSolid() const { return fractionleftsolid; }
int HitGroup() const { return hitgroup; } int HitGroup() const { return hitgroup; }
@ -143,8 +134,24 @@ public:
bool AllSolid() const { return allsolid; } bool AllSolid() const { return allsolid; }
bool StartSolid() const { return startsolid; } bool StartSolid() const { return startsolid; }
HSCRIPT Surface() const { return m_surfaceAccessor; } HSCRIPT Surface()
HSCRIPT Plane() const { return m_planeAccessor; } {
if ( !m_surfaceAccessor )
{
m_surfaceHelper.Init( &surface );
m_surfaceAccessor = g_pScriptVM->RegisterInstance( &m_surfaceHelper );
}
return m_surfaceAccessor;
}
HSCRIPT Plane()
{
if ( !m_planeAccessor )
m_planeAccessor = g_pScriptVM->RegisterInstance( &plane );
return m_planeAccessor;
}
void Destroy() {} void Destroy() {}