Skip to content

Add filtername to brush doors from HL:S #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SirYodaJedi wants to merge 2 commits into
base: develop
Choose a base branch
from
+6 −6
Draft

Add filtername to brush doors from HL:S #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27515f5
Add `filtername` to brush doors from HL:S
SirYodaJedi Dec 9, 2025
38103fb
Attempt to fix #ifdef syntax
SirYodaJedi Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sp/src/game/server/doors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "engine/IEngineSound.h"
#include "physics_npc_solver.h"

#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
#include "filters.h"
#endif

Expand Down Expand Up @@ -54,7 +54,7 @@ BEGIN_DATADESC( CBaseDoor )
DEFINE_KEYFIELD( m_bForceClosed, FIELD_BOOLEAN, "forceclosed" ),
DEFINE_FIELD( m_bDoorGroup, FIELD_BOOLEAN ),

#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
DEFINE_KEYFIELD( m_iBlockFilterName, FIELD_STRING, "filtername" ),
DEFINE_FIELD( m_hBlockFilter, FIELD_EHANDLE ),
#endif
Expand Down Expand Up @@ -500,7 +500,7 @@ void CBaseDoor::Activate( void )
break;
}

#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
// Get a handle to my filter entity if there is one
if (m_iBlockFilterName != NULL_STRING)
{
Expand Down Expand Up @@ -615,7 +615,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
// Ignore touches by anything but players.
if ( !pOther->IsPlayer() )
{
#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
if( PassesBlockTouchFilter( pOther ) && m_toggle_state == TS_GOING_DOWN )
{
DoorGoUp();
Expand Down Expand Up @@ -661,7 +661,7 @@ void CBaseDoor::DoorTouch( CBaseEntity *pOther )
}
}

#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
bool CBaseDoor::PassesBlockTouchFilter(CBaseEntity *pOther)
{
CBaseFilter* pFilter = (CBaseFilter*)(m_hBlockFilter.Get());
Expand Down
2 changes: 1 addition & 1 deletion sp/src/game/server/doors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class CBaseDoor : public CBaseToggle
void StartMovingSound( void );
virtual void StopMovingSound( void );
void MovingSoundThink( void );
#ifdef HL1_DLL
#if defined(HL1_DLL) || defined(MAPBASE)
bool PassesBlockTouchFilter(CBaseEntity *pOther);
string_t m_iBlockFilterName;
EHANDLE m_hBlockFilter;
Expand Down