From 2df762e705d4726d5017b670138660bc8079053a Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Tue, 11 Jul 2017 01:40:26 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/f8db63a45bcc62d6110051109daca77031699df8

---
 dlls/plats.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/plats.cpp b/dlls/plats.cpp
index a60e6706..5d5d1f07 100644
--- a/dlls/plats.cpp
+++ b/dlls/plats.cpp
@@ -375,6 +375,13 @@ void CPlatTrigger::Touch( CBaseEntity *pOther )
 
 	CFuncPlat *pPlatform = (CFuncPlat*)(CBaseEntity*)m_hPlatform;
 
+	if( FNullEnt( pPlatform ) )
+	{
+		// The target platform has been removed, remove myself as well. - Solokiller
+		UTIL_Remove( this );
+		return;
+	}
+
 	// Ignore touches by corpses
 	if( !pOther->IsAlive() )
 		return;
@@ -429,7 +436,7 @@ void CFuncPlat::GoDown( void )
 }
 
 //
-// Platform has hit bottom.  Stops and waits forever.
+// Platform has hit bottom. Stops and waits forever.
 //
 void CFuncPlat::HitBottom( void )
 {
@@ -458,7 +465,7 @@ void CFuncPlat::GoUp( void )
 }
 
 //
-// Platform has hit top.  Pauses, then starts back down again.
+// Platform has hit top. Pauses, then starts back down again.
 //
 void CFuncPlat::HitTop( void )
 {
@@ -556,7 +563,7 @@ void CFuncPlatRot::GoDown( void )
 }
 
 //
-// Platform has hit bottom.  Stops and waits forever.
+// Platform has hit bottom. Stops and waits forever.
 //
 void CFuncPlatRot::HitBottom( void )
 {
@@ -575,7 +582,7 @@ void CFuncPlatRot::GoUp( void )
 }
 
 //
-// Platform has hit top.  Pauses, then starts back down again.
+// Platform has hit top. Pauses, then starts back down again.
 //
 void CFuncPlatRot::HitTop( void )
 {
@@ -857,8 +864,8 @@ void CFuncTrain::Precache( void )
 	case 1:
 		PRECACHE_SOUND( "plats/train2.wav" );
 		PRECACHE_SOUND( "plats/train1.wav" );
-		pev->noise = MAKE_STRING("plats/train2.wav" );
-		pev->noise1 = MAKE_STRING("plats/train1.wav" );
+		pev->noise = MAKE_STRING( "plats/train2.wav" );
+		pev->noise1 = MAKE_STRING( "plats/train1.wav" );
 		break;
 	case 2:
 		PRECACHE_SOUND( "plats/platmove1.wav" );