FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Teleport improvements

This commit is contained in:
mittorn 2016-09-27 21:57:40 +07:00
parent 5616b6017d
commit 65871ac312
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dlls/triggers.cpp
View File

@ -1837,29 +1837,39 @@ void CBaseTrigger::TeleportTouch( CBaseEntity *pOther )
entvars_t *pevToucher = pOther->pev;
edict_t *pentTarget = NULL;
// Only teleport monsters or clients
if( !FBitSet( pevToucher->flags, FL_CLIENT | FL_MONSTER ) )
return;
if( !UTIL_IsMasterTriggered( m_sMaster, pOther ) )
return;
if( !( pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS ) )
if( !(pev->spawnflags & SF_TRIGGER_TELEPORTALL) )
{
// no monsters allowed!
if( FBitSet( pevToucher->flags, FL_MONSTER ) )
{
// Only teleport monsters or clients
if( !FBitSet( pevToucher->flags, FL_CLIENT | FL_MONSTER ) )
return;
if( !UTIL_IsMasterTriggered( m_sMaster, pOther ) )
return;
if( !( pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS ) )
{
// no monsters allowed!
if( FBitSet( pevToucher->flags, FL_MONSTER ) )
{
return;
}
}
if( ( pev->spawnflags & SF_TRIGGER_NOCLIENTS ) )
{
// no clients allowed
if( pOther->IsPlayer() )
{
return;
}
}
}
if( ( pev->spawnflags & SF_TRIGGER_NOCLIENTS ) )
else
{
// no clients allowed
if( pOther->IsPlayer() )
{
if( pOther->IsBSPModel() )
return;
if(pOther == this)
return;
}
}
pentTarget = FIND_ENTITY_BY_TARGETNAME( pentTarget, STRING( pev->target ) );
@ -1878,8 +1888,10 @@ void CBaseTrigger::TeleportTouch( CBaseEntity *pOther )
pevToucher->flags &= ~FL_ONGROUND;
UTIL_SetOrigin( pevToucher, tmp );
pevToucher->angles = pentTarget->v.angles;
if( pev->spawnflags & SF_TRIGGER_PORTAL )
pevToucher->angles = pevToucher->angles + pentTarget->v.angles;
else
pevToucher->angles = pentTarget->v.angles;
if( pOther->IsPlayer() )
{
@ -1887,7 +1899,8 @@ void CBaseTrigger::TeleportTouch( CBaseEntity *pOther )
}
pevToucher->fixangle = TRUE;
pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
if( !( pev->spawnflags & SF_TRIGGER_PORTAL ) )
pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
}
class CTriggerTeleport : public CBaseTrigger

2
dlls/util.h
View File

@ -459,6 +459,8 @@ extern DLL_GLOBAL int g_Language;
#define SF_TRIGGER_ALLOWMONSTERS 1// monsters allowed to fire this trigger
#define SF_TRIGGER_NOCLIENTS 2// players not allowed to fire this trigger
#define SF_TRIGGER_PUSHABLES 4// only pushables can fire this trigger
#define SF_TRIGGER_PORTAL 8// apply angles relative
#define SF_TRIGGER_TELEPORTALL 16// teleport all entities
// func breakable
#define SF_BREAK_TRIGGER_ONLY 1// may only be broken by trigger