mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-08-29 07:12:41 +00:00
Merge 5a13e06f52
This commit is contained in:
parent
d3ebe0ac46
commit
391c2aa217
@ -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 )
|
||||||
|
@ -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;
|
||||||
|
@ -768,9 +768,11 @@ void CFuncTrain::Next( void )
|
|||||||
// 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 ) );
|
STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING( pev->noiseMovement ) );
|
||||||
if ( 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 );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user