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

Fixing bad merge of CBaseEntity::FindNamedOutput

Browse Source
This commit is contained in:
James Mitchell 2020-05-19 22:12:35 +10:00
parent 3bdbef4169
commit d52196a0b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sp/src/game/server/baseentity.cpp
View File

@ -1340,7 +1340,7 @@ CBaseEntityOutput *CBaseEntity::FindNamedOutput( const char *pszOutput )
typedescription_t *dataDesc = &dmap->dataDesc[i]; typedescription_t *dataDesc = &dmap->dataDesc[i];
if ( ( dataDesc->fieldType == FIELD_CUSTOM ) && ( dataDesc->flags & FTYPEDESC_OUTPUT ) ) if ( ( dataDesc->fieldType == FIELD_CUSTOM ) && ( dataDesc->flags & FTYPEDESC_OUTPUT ) )
{ {
CBaseEntityOutput *pOutput = ( CBaseEntityOutput * )( ( int )this + ( int )dataDesc->fieldOffset ); CBaseEntityOutput *pOutput = ( CBaseEntityOutput * )( ( int )this + ( int )dataDesc->fieldOffset[0] );
if ( !Q_stricmp( dataDesc->externalName, pszOutput ) ) if ( !Q_stricmp( dataDesc->externalName, pszOutput ) )
{ {
return pOutput; return pOutput;
@ -7147,6 +7147,7 @@ const char *CBaseEntity::GetContextValue( int index ) const
} }
return m_ResponseContexts[ index ].m_iszValue.ToCStr(); return m_ResponseContexts[ index ].m_iszValue.ToCStr();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------