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

Fixed an accidental omission from the EmitSound_t hooks (particularly the code which actually runs them)

Browse Source
This commit is contained in:
Blixibon 2021-09-20 15:30:16 -05:00
parent 0368abaf29
commit 08dcf3ffff
1 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sp/src/game/shared/baseentity_shared.cpp
View File

@ -2393,8 +2393,67 @@ void CBaseEntity::ModifyEmitSoundParams( EmitSound_t &params )
params.m_pSoundName = GameRules()->TranslateEffectForVisionFilter( "sounds", params.m_pSoundName );
}
#endif
#ifdef MAPBASE_VSCRIPT
if (m_ScriptScope.IsInitialized() && g_Hook_ModifyEmitSoundParams.CanRunInScope( m_ScriptScope ))
{
HSCRIPT hParams = g_pScriptVM->RegisterInstance( reinterpret_cast<ScriptEmitSound_t*>(&params) );
// params
ScriptVariant_t functionReturn;
ScriptVariant_t args[] = { ScriptVariant_t( hParams ) };
g_Hook_ModifyEmitSoundParams.Call( m_ScriptScope, &functionReturn, args );
g_pScriptVM->RemoveInstance( hParams );
}
#endif
}
#if defined(MAPBASE) && defined(GAME_DLL)
void CBaseEntity::ModifySentenceParams( int &iSentenceIndex, int &iChannel, float &flVolume, soundlevel_t &iSoundlevel, int &iFlags, int &iPitch,
const Vector **pOrigin, const Vector **pDirection, bool &bUpdatePositions, float &soundtime, int &iSpecialDSP, int &iSpeakerIndex )
{
#ifdef MAPBASE_VSCRIPT
if (m_ScriptScope.IsInitialized() && g_Hook_ModifySentenceParams.CanRunInScope( m_ScriptScope ))
{
// This is a bit of a hack, but for consistency with ModifyEmitSoundParams, put them into an EmitSound_t params
ScriptEmitSound_t params;
params.m_pSoundName = engine->SentenceNameFromIndex( iSentenceIndex );
params.m_nChannel = iChannel;
params.m_flVolume = flVolume;
params.m_SoundLevel = iSoundlevel;
params.m_nFlags = iFlags;
params.m_nPitch = iPitch;
params.m_pOrigin = *pOrigin;
params.m_flSoundTime = soundtime;
params.m_nSpecialDSP = iSpecialDSP;
params.m_nSpeakerEntity = iSpeakerIndex;
HSCRIPT hParams = g_pScriptVM->RegisterInstance( &params );
// params
ScriptVariant_t functionReturn;
ScriptVariant_t args[] = { ScriptVariant_t( hParams ) };
if (g_Hook_ModifySentenceParams.Call( m_ScriptScope, &functionReturn, args ))
{
iSentenceIndex = engine->SentenceIndexFromName( params.m_pSoundName );
iChannel = params.m_nChannel;
flVolume = params.m_flVolume;
iSoundlevel = params.m_SoundLevel;
iFlags = params.m_nFlags;
iPitch = params.m_nPitch;
*pOrigin = params.m_pOrigin;
soundtime = params.m_flSoundTime;
iSpecialDSP = params.m_nSpecialDSP;
iSpeakerIndex = params.m_nSpeakerEntity;
}
g_pScriptVM->RemoveInstance( hParams );
}
#endif
}
#endif
//-----------------------------------------------------------------------------
// These methods encapsulate MOVETYPE_FOLLOW, which became obsolete
//-----------------------------------------------------------------------------