From 391c2aa2175d8e5511d80f68bac6d4b511739ca6 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Sun, 2 Jul 2017 20:09:34 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/5a13e06f522b1aff363fd0b1d360c2ed725cc6e4

---
 dlls/aflock.cpp |  6 +++---
 dlls/client.cpp |  2 +-
 dlls/plats.cpp  | 24 +++++++++++++-----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dlls/aflock.cpp b/dlls/aflock.cpp
index 19998a9d..d50a8165 100644
--- a/dlls/aflock.cpp
+++ b/dlls/aflock.cpp
@@ -839,11 +839,11 @@ void CFlockingFlyer::SquadRemove( CFlockingFlyer *pRemove )
 		{
 			CFlockingFlyer *pLeader = m_pSquadNext;
 
-			// copy the enemy LKP to the new leader
-			pLeader->m_vecEnemyLKP = m_vecEnemyLKP;
-
 			if( pLeader )
 			{
+				// copy the enemy LKP to the new leader
+				pLeader->m_vecEnemyLKP = m_vecEnemyLKP;
+
 				CFlockingFlyer *pList = pLeader;
 
 				while( pList )
diff --git a/dlls/client.cpp b/dlls/client.cpp
index ea4eb590..5d41d6ad 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -353,7 +353,7 @@ void Host_Say( edict_t *pEntity, int teamonly )
 	}
 
 	// remove quotes if present
-	if( *p == '"' )
+	if( p && *p == '"' )
 	{
 		p++;
 		p[strlen( p ) - 1] = 0;
diff --git a/dlls/plats.cpp b/dlls/plats.cpp
index 8fecf684..203f5d9b 100644
--- a/dlls/plats.cpp
+++ b/dlls/plats.cpp
@@ -743,21 +743,21 @@ void CFuncTrain::Next( void )
 	pev->target = pTarg->pev->target;
 	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)
 		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.
 
 	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.
-		SetBits(pev->effects, EF_NOINTERP);
-		UTIL_SetOrigin(pev, pTarg->pev->origin - (pev->mins + pev->maxs)* 0.5);
+		SetBits( pev->effects, EF_NOINTERP );
+		UTIL_SetOrigin( pev, pTarg->pev->origin - ( pev->mins + pev->maxs ) * 0.5 );
 		Wait(); // Get on with doing the next path corner.
 	}
 	else
@@ -767,13 +767,15 @@ void CFuncTrain::Next( void )
 		// 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.
 		// this is not a hack or temporary fix, this is how things should be. (sjb).
-		if ( 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);
-		ClearBits(pev->effects, EF_NOINTERP);
+		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 );
+		}
+
+		ClearBits( pev->effects, EF_NOINTERP );
 		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 );
 	}
 }