mirror of
https://github.com/mapbase-source/source-sdk-2013.git
synced 2025-03-22 10:30:20 +03:00
Fixed memory leaks and unsafe code, reworked script CGameTrace
This commit is contained in:
samisalreadytaken
parent
9c942903e9
commit
700ac4ed78
@ -10213,13 +10213,10 @@ const Vector& CBaseEntity::ScriptGetBoundingMaxs(void)
|
||||
//-----------------------------------------------------------------------------
|
||||
int CBaseEntity::ScriptTakeDamage( HSCRIPT pInfo )
|
||||
{
|
||||
if (pInfo)
|
||||
CTakeDamageInfo *info = HScriptToClass< CTakeDamageInfo >( pInfo );
|
||||
if ( info )
|
||||
{
|
||||
CTakeDamageInfo *info = HScriptToClass<CTakeDamageInfo>( pInfo ); //ToDamageInfo( pInfo );
|
||||
if (info)
|
||||
{
|
||||
return OnTakeDamage( *info );
|
||||
}
|
||||
return OnTakeDamage( *info );
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -10229,14 +10226,10 @@ int CBaseEntity::ScriptTakeDamage( HSCRIPT pInfo )
|
||||
//-----------------------------------------------------------------------------
|
||||
void CBaseEntity::ScriptFireBullets( HSCRIPT pInfo )
|
||||
{
|
||||
if (pInfo)
|
||||
FireBulletsInfo_t *info = HScriptToClass< FireBulletsInfo_t >( pInfo );
|
||||
if ( info )
|
||||
{
|
||||
extern FireBulletsInfo_t *GetFireBulletsInfoFromInfo( HSCRIPT hBulletsInfo );
|
||||
FireBulletsInfo_t *info = GetFireBulletsInfoFromInfo( pInfo );
|
||||
if (info)
|
||||
{
|
||||
FireBullets( *info );
|
||||
}
|
||||
FireBullets( *info );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -258,8 +258,8 @@ void ScriptDispatchSpawn( HSCRIPT hEntity )
|
||||
static HSCRIPT 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, true );
|
||||
CTakeDamageInfo *damageInfo = new CTakeDamageInfo( ToEnt(hInflictor), ToEnt(hAttacker), flDamage, iDamageType );
|
||||
HSCRIPT hScript = g_pScriptVM->RegisterInstance( damageInfo );
|
||||
|
||||
damageInfo->SetDamagePosition( vecDamagePos );
|
||||
damageInfo->SetDamageForce( vecForce );
|
||||
@ -269,28 +269,54 @@ static HSCRIPT CreateDamageInfo( HSCRIPT hInflictor, HSCRIPT hAttacker, const Ve
|
||||
|
||||
static void DestroyDamageInfo( HSCRIPT hDamageInfo )
|
||||
{
|
||||
if (hDamageInfo)
|
||||
CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( hDamageInfo );
|
||||
if ( pInfo )
|
||||
{
|
||||
CTakeDamageInfo *pInfo = (CTakeDamageInfo*)g_pScriptVM->GetInstanceValue( hDamageInfo, GetScriptDescForClass( CTakeDamageInfo ) );
|
||||
if (pInfo)
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( hDamageInfo );
|
||||
delete pInfo;
|
||||
}
|
||||
g_pScriptVM->RemoveInstance( hDamageInfo );
|
||||
delete pInfo;
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptCalculateExplosiveDamageForce( HSCRIPT info, const Vector &vecDir, const Vector &vecForceOrigin, float flScale ) { CalculateExplosiveDamageForce( HScriptToClass<CTakeDamageInfo>(info), vecDir, vecForceOrigin, flScale ); }
|
||||
void ScriptCalculateBulletDamageForce( HSCRIPT info, int iBulletType, const Vector &vecBulletDir, const Vector &vecForceOrigin, float flScale ) { CalculateBulletDamageForce( HScriptToClass<CTakeDamageInfo>(info), iBulletType, vecBulletDir, vecForceOrigin, flScale ); }
|
||||
void ScriptCalculateMeleeDamageForce( HSCRIPT info, const Vector &vecMeleeDir, const Vector &vecForceOrigin, float flScale ) { CalculateMeleeDamageForce( HScriptToClass<CTakeDamageInfo>( info ), vecMeleeDir, vecForceOrigin, flScale ); }
|
||||
void ScriptGuessDamageForce( HSCRIPT info, const Vector &vecForceDir, const Vector &vecForceOrigin, float flScale ) { GuessDamageForce( HScriptToClass<CTakeDamageInfo>( info ), vecForceDir, vecForceOrigin, flScale ); }
|
||||
void ScriptCalculateExplosiveDamageForce( HSCRIPT info, const Vector &vecDir, const Vector &vecForceOrigin, float flScale )
|
||||
{
|
||||
CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( info );
|
||||
if ( pInfo )
|
||||
{
|
||||
CalculateExplosiveDamageForce( pInfo, vecDir, vecForceOrigin, flScale );
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptCalculateBulletDamageForce( HSCRIPT info, int iBulletType, const Vector &vecBulletDir, const Vector &vecForceOrigin, float flScale )
|
||||
{
|
||||
CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( info );
|
||||
if ( pInfo )
|
||||
{
|
||||
CalculateBulletDamageForce( pInfo, iBulletType, vecBulletDir, vecForceOrigin, flScale );
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptCalculateMeleeDamageForce( HSCRIPT info, const Vector &vecMeleeDir, const Vector &vecForceOrigin, float flScale )
|
||||
{
|
||||
CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( info );
|
||||
if ( pInfo )
|
||||
{
|
||||
CalculateMeleeDamageForce( pInfo, vecMeleeDir, vecForceOrigin, flScale );
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptGuessDamageForce( HSCRIPT info, const Vector &vecForceDir, const Vector &vecForceOrigin, float flScale )
|
||||
{
|
||||
CTakeDamageInfo *pInfo = HScriptToClass< CTakeDamageInfo >( info );
|
||||
if ( pInfo )
|
||||
{
|
||||
GuessDamageForce( pInfo, vecForceDir, vecForceOrigin, flScale );
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
//-----------------------------------------------------------------------------
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( CTraceInfoAccessor, "CGameTrace", "Handle for accessing trace_t info." )
|
||||
DEFINE_SCRIPT_CONSTRUCTOR()
|
||||
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptGameTrace, "CGameTrace", "trace_t" )
|
||||
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." )
|
||||
@ -324,7 +350,7 @@ BEGIN_SCRIPTDESC_ROOT_NAMED( CTraceInfoAccessor, "CGameTrace", "Handle for acces
|
||||
DEFINE_SCRIPTFUNC( Destroy, "Deletes this instance. Important for preventing memory leaks." )
|
||||
END_SCRIPTDESC();
|
||||
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( scriptsurfacedata_t, "surfacedata_t", "Handle for accessing surface data." )
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( scriptsurfacedata_t, "surfacedata_t", "" )
|
||||
DEFINE_SCRIPTFUNC( GetFriction, "The surface's friction." )
|
||||
DEFINE_SCRIPTFUNC( GetThickness, "The surface's thickness." )
|
||||
|
||||
@ -343,69 +369,44 @@ BEGIN_SCRIPTDESC_ROOT_NAMED( scriptsurfacedata_t, "surfacedata_t", "Handle for a
|
||||
DEFINE_SCRIPTFUNC( GetSoundStrain, "The surface's strain sound." )
|
||||
END_SCRIPTDESC();
|
||||
|
||||
const char* scriptsurfacedata_t::GetSoundStepLeft() { return physprops->GetString( sounds.stepleft ); }
|
||||
const char* scriptsurfacedata_t::GetSoundStepRight() { return physprops->GetString( sounds.stepright ); }
|
||||
const char* scriptsurfacedata_t::GetSoundImpactSoft() { return physprops->GetString( sounds.impactSoft ); }
|
||||
const char* scriptsurfacedata_t::GetSoundImpactHard() { return physprops->GetString( sounds.impactHard ); }
|
||||
const char* scriptsurfacedata_t::GetSoundScrapeSmooth() { return physprops->GetString( sounds.scrapeSmooth ); }
|
||||
const char* scriptsurfacedata_t::GetSoundScrapeRough() { return physprops->GetString( sounds.scrapeRough ); }
|
||||
const char* scriptsurfacedata_t::GetSoundBulletImpact() { return physprops->GetString( sounds.bulletImpact ); }
|
||||
const char* scriptsurfacedata_t::GetSoundRolling() { return physprops->GetString( sounds.rolling ); }
|
||||
const char* scriptsurfacedata_t::GetSoundBreak() { return physprops->GetString( sounds.breakSound ); }
|
||||
const char* scriptsurfacedata_t::GetSoundStrain() { return physprops->GetString( sounds.strainSound ); }
|
||||
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( CSurfaceScriptAccessor, "csurface_t", "Handle for accessing csurface_t info." )
|
||||
BEGIN_SCRIPTDESC_ROOT_NAMED( CSurfaceScriptHelper, "csurface_t", "" )
|
||||
DEFINE_SCRIPTFUNC( Name, "The surface's name." )
|
||||
DEFINE_SCRIPTFUNC( SurfaceProps, "The surface's properties." )
|
||||
|
||||
DEFINE_SCRIPTFUNC( Destroy, "Deletes this instance. Important for preventing memory leaks." )
|
||||
END_SCRIPTDESC();
|
||||
|
||||
CPlaneTInstanceHelper g_PlaneTInstanceHelper;
|
||||
|
||||
BEGIN_SCRIPTDESC_ROOT( cplane_t, "Handle for accessing cplane_t info." )
|
||||
BEGIN_SCRIPTDESC_ROOT( cplane_t, "" )
|
||||
DEFINE_SCRIPT_INSTANCE_HELPER( &g_PlaneTInstanceHelper )
|
||||
END_SCRIPTDESC();
|
||||
|
||||
static HSCRIPT ScriptTraceLineComplex( const Vector &vecStart, const Vector &vecEnd, HSCRIPT entIgnore, int iMask, int iCollisionGroup )
|
||||
{
|
||||
// The script is responsible for deleting this via Destroy().
|
||||
CTraceInfoAccessor *traceInfo = new CTraceInfoAccessor();
|
||||
HSCRIPT hScript = g_pScriptVM->RegisterInstance( traceInfo, true );
|
||||
CScriptGameTrace *tr = new CScriptGameTrace();
|
||||
|
||||
CBaseEntity *pLooker = ToEnt(entIgnore);
|
||||
UTIL_TraceLine( vecStart, vecEnd, iMask, pLooker, iCollisionGroup, &traceInfo->GetTrace());
|
||||
CBaseEntity *pIgnore = ToEnt( entIgnore );
|
||||
UTIL_TraceLine( vecStart, vecEnd, iMask, pIgnore, iCollisionGroup, tr );
|
||||
|
||||
// The trace's destruction should destroy this automatically
|
||||
CSurfaceScriptAccessor *surfaceInfo = new CSurfaceScriptAccessor( traceInfo->GetTrace().surface );
|
||||
HSCRIPT hSurface = g_pScriptVM->RegisterInstance( surfaceInfo );
|
||||
traceInfo->SetSurface( hSurface );
|
||||
tr->RegisterSurface();
|
||||
tr->RegisterPlane();
|
||||
|
||||
HSCRIPT hPlane = g_pScriptVM->RegisterInstance( &(traceInfo->GetTrace().plane) );
|
||||
traceInfo->SetPlane( hPlane );
|
||||
|
||||
return hScript;
|
||||
return tr->GetScriptInstance();
|
||||
}
|
||||
|
||||
static HSCRIPT 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().
|
||||
CTraceInfoAccessor *traceInfo = new CTraceInfoAccessor();
|
||||
HSCRIPT hScript = g_pScriptVM->RegisterInstance( traceInfo, true );
|
||||
CScriptGameTrace *tr = new CScriptGameTrace();
|
||||
|
||||
CBaseEntity *pLooker = ToEnt(entIgnore);
|
||||
UTIL_TraceHull( vecStart, vecEnd, hullMin, hullMax, iMask, pLooker, iCollisionGroup, &traceInfo->GetTrace());
|
||||
CBaseEntity *pIgnore = ToEnt( entIgnore );
|
||||
UTIL_TraceHull( vecStart, vecEnd, hullMin, hullMax, iMask, pIgnore, iCollisionGroup, tr );
|
||||
|
||||
// The trace's destruction should destroy this automatically
|
||||
CSurfaceScriptAccessor *surfaceInfo = new CSurfaceScriptAccessor( traceInfo->GetTrace().surface );
|
||||
HSCRIPT hSurface = g_pScriptVM->RegisterInstance( surfaceInfo );
|
||||
traceInfo->SetSurface( hSurface );
|
||||
tr->RegisterSurface();
|
||||
tr->RegisterPlane();
|
||||
|
||||
HSCRIPT hPlane = g_pScriptVM->RegisterInstance( &(traceInfo->GetTrace().plane) );
|
||||
traceInfo->SetPlane( hPlane );
|
||||
|
||||
return hScript;
|
||||
return tr->GetScriptInstance();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -451,8 +452,6 @@ BEGIN_SCRIPTDESC_ROOT( FireBulletsInfo_t, "Handle for accessing FireBulletsInfo_
|
||||
|
||||
DEFINE_SCRIPTFUNC( GetPrimaryAttack, "Gets whether the bullets came from a primary attack." )
|
||||
DEFINE_SCRIPTFUNC( SetPrimaryAttack, "Sets whether the bullets came from a primary attack." )
|
||||
|
||||
//DEFINE_SCRIPTFUNC( Destroy, "Deletes this instance. Important for preventing memory leaks." )
|
||||
END_SCRIPTDESC();
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -483,7 +482,7 @@ static HSCRIPT CreateFireBulletsInfo( int cShots, const Vector &vecSrc, const Ve
|
||||
{
|
||||
// The script is responsible for deleting this via DestroyFireBulletsInfo().
|
||||
FireBulletsInfo_t *info = new FireBulletsInfo_t();
|
||||
HSCRIPT hScript = g_pScriptVM->RegisterInstance( info, true );
|
||||
HSCRIPT hScript = g_pScriptVM->RegisterInstance( info );
|
||||
|
||||
info->SetShots( cShots );
|
||||
info->SetSource( vecSrc );
|
||||
@ -497,13 +496,12 @@ static HSCRIPT CreateFireBulletsInfo( int cShots, const Vector &vecSrc, const Ve
|
||||
|
||||
static void DestroyFireBulletsInfo( HSCRIPT hBulletsInfo )
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( hBulletsInfo );
|
||||
}
|
||||
|
||||
// For the function in baseentity.cpp
|
||||
FireBulletsInfo_t *GetFireBulletsInfoFromInfo( HSCRIPT hBulletsInfo )
|
||||
{
|
||||
return HScriptToClass<FireBulletsInfo_t>( hBulletsInfo );
|
||||
FireBulletsInfo_t *pInfo = HScriptToClass< FireBulletsInfo_t >( hBulletsInfo );
|
||||
if ( pInfo )
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( hBulletsInfo );
|
||||
delete pInfo;
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -844,8 +842,11 @@ static void ScriptEntitiesInSphere( HSCRIPT hTable, int listMax, const Vector &c
|
||||
|
||||
static void ScriptDecalTrace( HSCRIPT hTrace, const char *decalName )
|
||||
{
|
||||
CTraceInfoAccessor *traceInfo = HScriptToClass<CTraceInfoAccessor>(hTrace);
|
||||
UTIL_DecalTrace( &traceInfo->GetTrace(), decalName );
|
||||
CScriptGameTrace *tr = HScriptToClass< CScriptGameTrace >( hTrace );
|
||||
if ( tr )
|
||||
{
|
||||
UTIL_DecalTrace( tr, decalName );
|
||||
}
|
||||
}
|
||||
|
||||
static HSCRIPT ScriptCreateRope( HSCRIPT hStart, HSCRIPT hEnd, int iStartAttachment, int iEndAttachment, float ropeWidth, const char *pMaterialName, int numSegments, int ropeFlags )
|
||||
|
||||
@ -21,42 +21,52 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
struct scriptsurfacedata_t : public surfacedata_t
|
||||
{
|
||||
float GetFriction() { return physics.friction; }
|
||||
float GetThickness() { return physics.thickness; }
|
||||
public:
|
||||
float GetFriction() const { return physics.friction; }
|
||||
float GetThickness() const { return physics.thickness; }
|
||||
|
||||
float GetJumpFactor() { return game.jumpFactor; }
|
||||
char GetMaterialChar() { return game.material; }
|
||||
float GetJumpFactor() const { return game.jumpFactor; }
|
||||
char GetMaterialChar() const { return game.material; }
|
||||
|
||||
const char* GetSoundStepLeft();
|
||||
const char* GetSoundStepRight();
|
||||
const char* GetSoundImpactSoft();
|
||||
const char* GetSoundImpactHard();
|
||||
const char* GetSoundScrapeSmooth();
|
||||
const char* GetSoundScrapeRough();
|
||||
const char* GetSoundBulletImpact();
|
||||
const char* GetSoundRolling();
|
||||
const char* GetSoundBreak();
|
||||
const char* GetSoundStrain();
|
||||
const char* GetSoundStepLeft() const { return physprops->GetString( sounds.stepleft ); }
|
||||
const char* GetSoundStepRight() const { return physprops->GetString( sounds.stepright ); }
|
||||
const char* GetSoundImpactSoft() const { return physprops->GetString( sounds.impactSoft ); }
|
||||
const char* GetSoundImpactHard() const { return physprops->GetString( sounds.impactHard ); }
|
||||
const char* GetSoundScrapeSmooth() const { return physprops->GetString( sounds.scrapeSmooth ); }
|
||||
const char* GetSoundScrapeRough() const { return physprops->GetString( sounds.scrapeRough ); }
|
||||
const char* GetSoundBulletImpact() const { return physprops->GetString( sounds.bulletImpact ); }
|
||||
const char* GetSoundRolling() const { return physprops->GetString( sounds.rolling ); }
|
||||
const char* GetSoundBreak() const { return physprops->GetString( sounds.breakSound ); }
|
||||
const char* GetSoundStrain() const { return physprops->GetString( sounds.strainSound ); }
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Exposes csurface_t to VScript
|
||||
//-----------------------------------------------------------------------------
|
||||
class CSurfaceScriptAccessor
|
||||
class CSurfaceScriptHelper
|
||||
{
|
||||
public:
|
||||
CSurfaceScriptAccessor( csurface_t &surf ) { m_surf = &surf; m_surfaceData = g_pScriptVM->RegisterInstance( reinterpret_cast<scriptsurfacedata_t*>(physprops->GetSurfaceData( m_surf->surfaceProps )) ); }
|
||||
~CSurfaceScriptAccessor() { delete m_surfaceData; }
|
||||
// This class is owned by CScriptGameTrace, and cannot be accessed without being initialised in CScriptGameTrace::RegisterSurface()
|
||||
//CSurfaceScriptHelper() : m_pSurface(NULL), m_hSurfaceData(NULL) {}
|
||||
|
||||
// cplane_t stuff
|
||||
const char* Name() const { return m_surf->name; }
|
||||
HSCRIPT SurfaceProps() const { return m_surfaceData; }
|
||||
~CSurfaceScriptHelper()
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( m_hSurfaceData );
|
||||
}
|
||||
|
||||
void Destroy() { delete this; }
|
||||
void Init( csurface_t *surf )
|
||||
{
|
||||
m_pSurface = surf;
|
||||
m_hSurfaceData = g_pScriptVM->RegisterInstance(
|
||||
reinterpret_cast< scriptsurfacedata_t* >( physprops->GetSurfaceData( m_pSurface->surfaceProps ) ) );
|
||||
}
|
||||
|
||||
const char* Name() const { return m_pSurface->name; }
|
||||
HSCRIPT SurfaceProps() const { return m_hSurfaceData; }
|
||||
|
||||
private:
|
||||
csurface_t *m_surf;
|
||||
HSCRIPT m_surfaceData;
|
||||
csurface_t *m_pSurface;
|
||||
HSCRIPT m_hSurfaceData;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -83,70 +93,80 @@ class CPlaneTInstanceHelper : public IScriptInstanceHelper
|
||||
//-----------------------------------------------------------------------------
|
||||
// Exposes trace_t to VScript
|
||||
//-----------------------------------------------------------------------------
|
||||
class CTraceInfoAccessor
|
||||
class CScriptGameTrace : public CGameTrace
|
||||
{
|
||||
public:
|
||||
~CTraceInfoAccessor()
|
||||
CScriptGameTrace() : m_surfaceAccessor(NULL), m_planeAccessor(NULL)
|
||||
{
|
||||
if (m_surfaceAccessor)
|
||||
{
|
||||
CSurfaceScriptAccessor *pScriptSurface = HScriptToClass<CSurfaceScriptAccessor>( m_surfaceAccessor );
|
||||
//g_pScriptVM->RemoveInstance( m_surfaceAccessor );
|
||||
delete pScriptSurface;
|
||||
}
|
||||
|
||||
//if (m_planeAccessor)
|
||||
//{
|
||||
// g_pScriptVM->RemoveInstance( m_planeAccessor );
|
||||
//}
|
||||
m_hScriptInstance = g_pScriptVM->RegisterInstance( this );
|
||||
}
|
||||
|
||||
// CGrameTrace stuff
|
||||
bool DidHitWorld() const { return m_tr.DidHitWorld(); }
|
||||
bool DidHitNonWorldEntity() const { return m_tr.DidHitNonWorldEntity(); }
|
||||
int GetEntityIndex() const { return m_tr.GetEntityIndex(); }
|
||||
bool DidHit() const { return m_tr.DidHit(); }
|
||||
~CScriptGameTrace()
|
||||
{
|
||||
if ( m_hScriptInstance )
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( m_hScriptInstance );
|
||||
}
|
||||
|
||||
float FractionLeftSolid() const { return m_tr.fractionleftsolid; }
|
||||
int HitGroup() const { return m_tr.hitgroup; }
|
||||
int PhysicsBone() const { return m_tr.physicsbone; }
|
||||
if ( m_surfaceAccessor )
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( m_surfaceAccessor );
|
||||
}
|
||||
|
||||
HSCRIPT Entity() const { return ToHScript(m_tr.m_pEnt); }
|
||||
if ( m_planeAccessor )
|
||||
{
|
||||
g_pScriptVM->RemoveInstance( m_planeAccessor );
|
||||
}
|
||||
}
|
||||
|
||||
int HitBox() const { return m_tr.hitbox; }
|
||||
void RegisterSurface()
|
||||
{
|
||||
m_surfaceHelper.Init( &surface );
|
||||
m_surfaceAccessor = g_pScriptVM->RegisterInstance( &m_surfaceHelper );
|
||||
}
|
||||
|
||||
// CBaseTrace stuff
|
||||
bool IsDispSurface() { return m_tr.IsDispSurface(); }
|
||||
bool IsDispSurfaceWalkable() { return m_tr.IsDispSurfaceWalkable(); }
|
||||
bool IsDispSurfaceBuildable() { return m_tr.IsDispSurfaceBuildable(); }
|
||||
bool IsDispSurfaceProp1() { return m_tr.IsDispSurfaceProp1(); }
|
||||
bool IsDispSurfaceProp2() { return m_tr.IsDispSurfaceProp2(); }
|
||||
void RegisterPlane()
|
||||
{
|
||||
m_planeAccessor = g_pScriptVM->RegisterInstance( &plane );
|
||||
}
|
||||
|
||||
const Vector& StartPos() const { return m_tr.startpos; }
|
||||
const Vector& EndPos() const { return m_tr.endpos; }
|
||||
HSCRIPT GetScriptInstance() const
|
||||
{
|
||||
return m_hScriptInstance;
|
||||
}
|
||||
|
||||
float Fraction() const { return m_tr.fraction; }
|
||||
public:
|
||||
float FractionLeftSolid() const { return fractionleftsolid; }
|
||||
int HitGroup() const { return hitgroup; }
|
||||
int PhysicsBone() const { return physicsbone; }
|
||||
|
||||
int Contents() const { return m_tr.contents; }
|
||||
int DispFlags() const { return m_tr.dispFlags; }
|
||||
HSCRIPT Entity() const { return ToHScript( m_pEnt ); }
|
||||
int HitBox() const { return hitbox; }
|
||||
|
||||
bool AllSolid() const { return m_tr.allsolid; }
|
||||
bool StartSolid() const { return m_tr.startsolid; }
|
||||
const Vector& StartPos() const { return startpos; }
|
||||
const Vector& EndPos() const { return endpos; }
|
||||
|
||||
HSCRIPT Surface() { return m_surfaceAccessor; }
|
||||
void SetSurface( HSCRIPT hSurfAccessor ) { m_surfaceAccessor = hSurfAccessor; }
|
||||
float Fraction() const { return fraction; }
|
||||
|
||||
HSCRIPT Plane() { return m_planeAccessor; }
|
||||
void SetPlane( HSCRIPT hPlaneAccessor ) { m_planeAccessor = hPlaneAccessor; }
|
||||
int Contents() const { return contents; }
|
||||
int DispFlags() const { return dispFlags; }
|
||||
|
||||
trace_t &GetTrace() { return m_tr; }
|
||||
void Destroy() { delete this; }
|
||||
bool AllSolid() const { return allsolid; }
|
||||
bool StartSolid() const { return startsolid; }
|
||||
|
||||
HSCRIPT Surface() const { return m_surfaceAccessor; }
|
||||
HSCRIPT Plane() const { return m_planeAccessor; }
|
||||
|
||||
void Destroy() { delete this; }
|
||||
|
||||
private:
|
||||
trace_t m_tr;
|
||||
|
||||
HSCRIPT m_surfaceAccessor;
|
||||
HSCRIPT m_planeAccessor;
|
||||
HSCRIPT m_hScriptInstance;
|
||||
|
||||
CSurfaceScriptHelper m_surfaceHelper;
|
||||
|
||||
CScriptGameTrace( const CScriptGameTrace& v );
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user