MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-30 15:47:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter_activator_model issues with save/restore and null activator

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2024-08-10 13:48:48 -05:00
parent 178a262032
commit 06596695a3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sp/src/game/server/filters.cpp
View File

@ -996,6 +996,9 @@ public:
bool PassesFilterImpl( CBaseEntity *pCaller, CBaseEntity *pEntity ) bool PassesFilterImpl( CBaseEntity *pCaller, CBaseEntity *pEntity )
{ {
if (!pEntity)
return false;
if (FStrEq(STRING(m_strFilterSkin), "-1") /*m_strFilterSkin == NULL_STRING|| FStrEq(STRING(m_strFilterSkin), "")*/) if (FStrEq(STRING(m_strFilterSkin), "-1") /*m_strFilterSkin == NULL_STRING|| FStrEq(STRING(m_strFilterSkin), "")*/)
return Matcher_NamesMatch(STRING(m_iFilterModel), STRING(pEntity->GetModelName())); return Matcher_NamesMatch(STRING(m_iFilterModel), STRING(pEntity->GetModelName()));
else if (pEntity->GetBaseAnimating()) else if (pEntity->GetBaseAnimating())
@ -1011,6 +1014,17 @@ public:
inputdata.value.Convert(FIELD_STRING); inputdata.value.Convert(FIELD_STRING);
m_iFilterModel = inputdata.value.StringID(); m_iFilterModel = inputdata.value.StringID();
} }
bool KeyValue( const char *szKeyName, const char *szValue )
{
if (FStrEq( szKeyName, "filtername" ))
{
m_iFilterModel = AllocPooledString( szValue );
return true;
}
else
return BaseClass::KeyValue( szKeyName, szValue );
}
}; };
LINK_ENTITY_TO_CLASS( filter_activator_model, CFilterModel ); LINK_ENTITY_TO_CLASS( filter_activator_model, CFilterModel );
@ -1019,7 +1033,6 @@ BEGIN_DATADESC( CFilterModel )
// Keyfields // Keyfields
DEFINE_KEYFIELD( m_iFilterModel, FIELD_STRING, "filtermodel" ), DEFINE_KEYFIELD( m_iFilterModel, FIELD_STRING, "filtermodel" ),
DEFINE_KEYFIELD( m_iFilterModel, FIELD_STRING, "filtername" ),
DEFINE_KEYFIELD( m_strFilterSkin, FIELD_STRING, "skin" ), DEFINE_KEYFIELD( m_strFilterSkin, FIELD_STRING, "skin" ),
END_DATADESC() END_DATADESC()