ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-03-21 01:41:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

o Leap no longer triggers 'the enemy approaches'

Browse source 
o Hive no longer takes FF damage
o Can no longer trigger 'the enemy approaches' during the pregame

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@456 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-05-07 08:37:00 +00:00
parent bdec1fa8e1
commit 57ed86bd75
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
releases/3.2.0/source/dlls/player.cpp
View file

@ -1784,11 +1784,12 @@ void CBasePlayer::PlayerUse ( void )
{
if ( pObject->pev->iuser3 != AVH_USER3_HIVE ) {
vec3_t objectLocation;
vec3_t playerLocation;
AvHSHUGetEntityLocation(pObject->entindex(), objectLocation);
AvHSHUGetEntityLocation(this->entindex(), playerLocation);
if ( VectorDistance(objectLocation, playerLocation) > PLAYER_SEARCH_RADIUS )
double distance=VectorDistance(objectLocation, pev->origin);
if ( distance > PLAYER_SEARCH_RADIUS ) {
ALERT(at_console, "skipping %d\n", pObject->entindex());
continue;
}
}
if (pObject->ObjectCaps() & (FCAP_IMPULSE_USE | FCAP_CONTINUOUS_USE | FCAP_ONOFF_USE))
{

2
releases/3.2.0/source/mod/AvHPlayer.cpp
View file

@ -2281,7 +2281,7 @@ void AvHPlayer::PlayerTouch(CBaseEntity* inOther)
entvars_t* theInflictor = this->m_pActiveItem->pev;
float theScalar = 1.0f;
if((this->mTimeLeapEnd != -1) && (gpGlobals->time < this->mTimeLeapEnd))
if((this->mTimeLeapEnd != -1) && (gpGlobals->time < this->mTimeLeapEnd) && inOther->pev->iuser3 != AVH_USER3_HIVE )
{
// Do damage to entity
if(GetGameRules()->CanEntityDoDamageTo(this, inOther, &theScalar) && (inOther->pev->team != this->pev->team))