From 27515f57c9f83064d33ef6178ac376f7417c9f08 Mon Sep 17 00:00:00 2001
From: Yui <50331474+SirYodaJedi@users.noreply.github.com>
Date: Tue, 9 Dec 2025 15:47:23 -0500
Subject: [PATCH 1/2] Add `filtername` to brush doors from HL:S

---
 sp/src/game/server/doors.cpp | 10 +++++-----
 sp/src/game/server/doors.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sp/src/game/server/doors.cpp b/sp/src/game/server/doors.cpp
index e76ba1994fc..39a2124816b 100644
--- a/sp/src/game/server/doors.cpp
+++ b/sp/src/game/server/doors.cpp
@@ -13,7 +13,7 @@
 #include "engine/IEngineSound.h"
 #include "physics_npc_solver.h"
 
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 #include "filters.h"
 #endif
 
@@ -54,7 +54,7 @@ BEGIN_DATADESC( CBaseDoor )
 	DEFINE_KEYFIELD( m_bForceClosed, FIELD_BOOLEAN, "forceclosed" ),
 	DEFINE_FIELD( m_bDoorGroup, FIELD_BOOLEAN ),
 
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 	DEFINE_KEYFIELD( m_iBlockFilterName,	FIELD_STRING,	"filtername" ),
 	DEFINE_FIELD( m_hBlockFilter, FIELD_EHANDLE ),
 #endif
@@ -500,7 +500,7 @@ void CBaseDoor::Activate( void )
 		break;
 	}
 
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 	// Get a handle to my filter entity if there is one
 	if (m_iBlockFilterName != NULL_STRING)
 	{
@@ -615,7 +615,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
 	// Ignore touches by anything but players.
 	if ( !pOther->IsPlayer() )
 	{
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 		if( PassesBlockTouchFilter( pOther ) && m_toggle_state == TS_GOING_DOWN )
 		{
 			DoorGoUp();
@@ -661,7 +661,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
 	}
 }
 
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 bool CBaseDoor::PassesBlockTouchFilter(CBaseEntity *pOther)
 {
 	CBaseFilter* pFilter = (CBaseFilter*)(m_hBlockFilter.Get());
diff --git a/sp/src/game/server/doors.h b/sp/src/game/server/doors.h
index 7658482cda1..35027311f98 100644
--- a/sp/src/game/server/doors.h
+++ b/sp/src/game/server/doors.h
@@ -141,7 +141,7 @@ class CBaseDoor : public CBaseToggle
 	void			StartMovingSound( void );
 	virtual void	StopMovingSound( void );
 	void			MovingSoundThink( void );
-#ifdef HL1_DLL
+#ifdef HL1_DLL || MAPBASE
 	bool		PassesBlockTouchFilter(CBaseEntity *pOther);
 	string_t	m_iBlockFilterName;
 	EHANDLE		m_hBlockFilter;

From 38103fb7e9a412a4ef72984bb2ad9cbedfaec77d Mon Sep 17 00:00:00 2001
From: Yui <50331474+SirYodaJedi@users.noreply.github.com>
Date: Sat, 13 Dec 2025 12:38:45 -0500
Subject: [PATCH 2/2] Attempt to fix #ifdef syntax

---
 sp/src/game/server/doors.cpp | 10 +++++-----
 sp/src/game/server/doors.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sp/src/game/server/doors.cpp b/sp/src/game/server/doors.cpp
index 39a2124816b..59338558e94 100644
--- a/sp/src/game/server/doors.cpp
+++ b/sp/src/game/server/doors.cpp
@@ -13,7 +13,7 @@
 #include "engine/IEngineSound.h"
 #include "physics_npc_solver.h"
 
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 #include "filters.h"
 #endif
 
@@ -54,7 +54,7 @@ BEGIN_DATADESC( CBaseDoor )
 	DEFINE_KEYFIELD( m_bForceClosed, FIELD_BOOLEAN, "forceclosed" ),
 	DEFINE_FIELD( m_bDoorGroup, FIELD_BOOLEAN ),
 
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 	DEFINE_KEYFIELD( m_iBlockFilterName,	FIELD_STRING,	"filtername" ),
 	DEFINE_FIELD( m_hBlockFilter, FIELD_EHANDLE ),
 #endif
@@ -500,7 +500,7 @@ void CBaseDoor::Activate( void )
 		break;
 	}
 
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 	// Get a handle to my filter entity if there is one
 	if (m_iBlockFilterName != NULL_STRING)
 	{
@@ -615,7 +615,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
 	// Ignore touches by anything but players.
 	if ( !pOther->IsPlayer() )
 	{
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 		if( PassesBlockTouchFilter( pOther ) && m_toggle_state == TS_GOING_DOWN )
 		{
 			DoorGoUp();
@@ -661,7 +661,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
 	}
 }
 
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 bool CBaseDoor::PassesBlockTouchFilter(CBaseEntity *pOther)
 {
 	CBaseFilter* pFilter = (CBaseFilter*)(m_hBlockFilter.Get());
diff --git a/sp/src/game/server/doors.h b/sp/src/game/server/doors.h
index 35027311f98..98e81e047de 100644
--- a/sp/src/game/server/doors.h
+++ b/sp/src/game/server/doors.h
@@ -141,7 +141,7 @@ class CBaseDoor : public CBaseToggle
 	void			StartMovingSound( void );
 	virtual void	StopMovingSound( void );
 	void			MovingSoundThink( void );
-#ifdef HL1_DLL || MAPBASE
+#if defined(HL1_DLL) || defined(MAPBASE)
 	bool		PassesBlockTouchFilter(CBaseEntity *pOther);
 	string_t	m_iBlockFilterName;
 	EHANDLE		m_hBlockFilter;