From d52196a0b182a09d5a81a5a528fedc56a9d0e93d Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 19 May 2020 22:12:35 +1000 Subject: [PATCH] Fixing bad merge of CBaseEntity::FindNamedOutput --- sp/src/game/server/baseentity.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sp/src/game/server/baseentity.cpp b/sp/src/game/server/baseentity.cpp index d194e706..69a5906c 100644 --- a/sp/src/game/server/baseentity.cpp +++ b/sp/src/game/server/baseentity.cpp @@ -1340,7 +1340,7 @@ CBaseEntityOutput *CBaseEntity::FindNamedOutput( const char *pszOutput ) typedescription_t *dataDesc = &dmap->dataDesc[i]; 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 ) ) { return pOutput; @@ -7147,6 +7147,7 @@ const char *CBaseEntity::GetContextValue( int index ) const } return m_ResponseContexts[ index ].m_iszValue.ToCStr(); + } //-----------------------------------------------------------------------------