From f15b5d686b9c0fbbd3da7db56b132382b0f10474 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Wed, 7 Dec 2016 00:24:14 +0500
Subject: [PATCH] Remove @malortie's hacks.

---
 dlls/cbase.cpp    | 14 --------------
 dlls/scripted.cpp | 14 +-------------
 dlls/triggers.cpp | 14 --------------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/dlls/cbase.cpp b/dlls/cbase.cpp
index b5e5ad78..62b4eaa1 100644
--- a/dlls/cbase.cpp
+++ b/dlls/cbase.cpp
@@ -135,20 +135,6 @@ int DispatchSpawn( edict_t *pent )
 
 	if( pEntity )
 	{
-		//
-		// The Gate:
-		//
-		// Prevent level shutting down due to engine limitation.
-		//
-		if( FStrEq( STRING( gpGlobals->mapname ), "gate18" ) )
-		{
-			if( FStringNull( pEntity->pev->targetname ) )
-			{
-				if( FClassnameIs( pEntity->pev, "monster_furniture" ) )
-					return 0;
-			}
-		}
-
 		// Initialize these or entities who don't link to the world won't have anything in here
 		pEntity->pev->absmin = pEntity->pev->origin - Vector( 1, 1, 1 );
 		pEntity->pev->absmax = pEntity->pev->origin + Vector( 1, 1, 1 );
diff --git a/dlls/scripted.cpp b/dlls/scripted.cpp
index 40d25cce..76768a98 100644
--- a/dlls/scripted.cpp
+++ b/dlls/scripted.cpp
@@ -1157,23 +1157,11 @@ public:
 	void Spawn( void );
 	void Die( void );
 	int Classify( void );
-	virtual int ObjectCaps( void );
+	virtual int ObjectCaps( void ) { return ( CBaseMonster::ObjectCaps() & ~FCAP_ACROSS_TRANSITION ); }
 };
 
 LINK_ENTITY_TO_CLASS( monster_furniture, CFurniture )
 
-int CFurniture::ObjectCaps( void )
-{
-	int caps = ( CBaseMonster::ObjectCaps() & ~FCAP_ACROSS_TRANSITION );
-
-	if( FStrEq( STRING( gpGlobals->mapname ), "gate18" ) )
-	{
-		caps |= FCAP_DONT_SAVE;
-	}
-
-	return caps;
-}
-
 //=========================================================
 // Furniture is killed
 //=========================================================
diff --git a/dlls/triggers.cpp b/dlls/triggers.cpp
index 3901b0f6..d7f9483c 100644
--- a/dlls/triggers.cpp
+++ b/dlls/triggers.cpp
@@ -779,20 +779,6 @@ void CTargetCDAudio::Play( void )
 
 void CTriggerHurt::Spawn( void )
 {
-	//
-	// The Gate:
-	//
-	// Remove to prevent a crash.
-	//
-	if( FStrEq( STRING( gpGlobals->mapname ), "tombtest2" ) )
-	{
-		if( !FStringNull( pev->targetname ) && FStrEq( STRING( pev->targetname ), "secondspikes" ) )
-		{
-			UTIL_Remove( this );
-			return;
-		}
-	}
-
 	InitTrigger();
 	SetTouch( &CBaseTrigger::HurtTouch );