YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge 5a13e06f52

halloween
Night Owl 8 years ago
parent
d3ebe0ac46
commit
391c2aa217
3 changed files with 17 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dlls/aflock.cpp
  2. 2
      dlls/client.cpp
  3. 24
      dlls/plats.cpp

4
dlls/aflock.cpp
Unescape View File

@ -839,11 +839,11 @@ void CFlockingFlyer::SquadRemove( CFlockingFlyer *pRemove )
{ {
CFlockingFlyer *pLeader = m_pSquadNext; CFlockingFlyer *pLeader = m_pSquadNext;
if( pLeader )
{
// copy the enemy LKP to the new leader // copy the enemy LKP to the new leader
pLeader->m_vecEnemyLKP = m_vecEnemyLKP; pLeader->m_vecEnemyLKP = m_vecEnemyLKP;
if( pLeader )
{
CFlockingFlyer *pList = pLeader; CFlockingFlyer *pList = pLeader;
while( pList ) while( pList )

2
dlls/client.cpp
Unescape View File

@ -353,7 +353,7 @@ void Host_Say( edict_t *pEntity, int teamonly )
} }
// remove quotes if present // remove quotes if present
if( *p == '"' ) if( p && *p == '"' )
{ {
p++; p++;
p[strlen( p ) - 1] = 0; p[strlen( p ) - 1] = 0;

24
dlls/plats.cpp
Unescape View File

@ -743,21 +743,21 @@ void CFuncTrain::Next( void )
pev->target = pTarg->pev->target; pev->target = pTarg->pev->target;
m_flWait = pTarg->GetDelay(); m_flWait = pTarg->GetDelay();
if ( m_pevCurrentTarget && m_pevCurrentTarget->speed != 0 ) if( m_pevCurrentTarget && m_pevCurrentTarget->speed != 0 )
{ {
// don't copy speed from target if it is 0 (uninitialized) // don't copy speed from target if it is 0 (uninitialized)
pev->speed = m_pevCurrentTarget->speed; pev->speed = m_pevCurrentTarget->speed;
ALERT( at_aiconsole, "Train %s speed to %4.2f\n", STRING(pev->targetname), pev->speed ); ALERT( at_aiconsole, "Train %s speed to %4.2f\n", STRING( pev->targetname ), pev->speed );
} }
m_pevCurrentTarget = pTarg->pev;// keep track of this since path corners change our target for us. m_pevCurrentTarget = pTarg->pev;// keep track of this since path corners change our target for us.
pev->enemy = pTarg->edict();//hack pev->enemy = pTarg->edict();//hack
if(FBitSet(m_pevCurrentTarget->spawnflags, SF_CORNER_TELEPORT)) if( FBitSet( m_pevCurrentTarget->spawnflags, SF_CORNER_TELEPORT ) )
{ {
// Path corner has indicated a teleport to the next corner. // Path corner has indicated a teleport to the next corner.
SetBits(pev->effects, EF_NOINTERP); SetBits( pev->effects, EF_NOINTERP );
UTIL_SetOrigin(pev, pTarg->pev->origin - (pev->mins + pev->maxs)* 0.5); UTIL_SetOrigin( pev, pTarg->pev->origin - ( pev->mins + pev->maxs ) * 0.5 );
Wait(); // Get on with doing the next path corner. Wait(); // Get on with doing the next path corner.
} }
else else
@ -767,13 +767,15 @@ void CFuncTrain::Next( void )
// CHANGED this from CHAN_VOICE to CHAN_STATIC around OEM beta time because trains should // CHANGED this from CHAN_VOICE to CHAN_STATIC around OEM beta time because trains should
// use CHAN_STATIC for their movement sounds to prevent sound field problems. // use CHAN_STATIC for their movement sounds to prevent sound field problems.
// this is not a hack or temporary fix, this is how things should be. (sjb). // this is not a hack or temporary fix, this is how things should be. (sjb).
if ( pev->noiseMovement ) if( pev->noiseMovement )
STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noiseMovement) ); {
if ( pev->noiseMovement ) STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING( pev->noiseMovement ) );
EMIT_SOUND (ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement), m_volume, ATTN_NORM); EMIT_SOUND( ENT( pev ), CHAN_STATIC, (char*)STRING( pev->noiseMovement ), m_volume, ATTN_NORM );
ClearBits(pev->effects, EF_NOINTERP); }
ClearBits( pev->effects, EF_NOINTERP );
SetMoveDone( &CFuncTrain::Wait ); SetMoveDone( &CFuncTrain::Wait );
LinearMove (pTarg->pev->origin - (pev->mins + pev->maxs)* 0.5, pev->speed); LinearMove( pTarg->pev->origin - ( pev->mins + pev->maxs )* 0.5, pev->speed );
} }
} }

Write Preview
Loading…
Cancel
Save