celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'temp/speech-utilities' of https://github.com/Blixibon/source-sdk-2013 into develop

Browse Source
This commit is contained in:
Blixibon
2022-01-17 17:11:00 -06:00
parent ed21bb3d1d 06d2da3742
commit abdd78e5e0
4 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
sp/src/game/server/sceneentity.cpp
View File

@@ -160,6 +160,7 @@ public:
#ifdef MAPBASE
bool IsRunningScriptedSceneWithFlexAndNotPaused( CBaseFlex *pActor, bool bIgnoreInstancedScenes, const char *pszNotThisScene = NULL );
bool IsTalkingInAScriptedScene( CBaseFlex *pActor, bool bIgnoreInstancedScenes = false );
CUtlVector< CHandle< CSceneEntity > > *GetActiveSceneList();
#endif
@@ -486,6 +487,9 @@ public:
bool HasUnplayedSpeech( void );
bool HasFlexAnimation( void );
#ifdef MAPBASE
bool IsPlayingSpeech( void );
#endif
void SetCurrentTime( float t, bool forceClientSync );
@@ -1158,6 +1162,31 @@ bool CSceneEntity::HasFlexAnimation( void )
return false;
}
#ifdef MAPBASE
//-----------------------------------------------------------------------------
// Purpose:
// Output : Returns true on success, false on failure.
//-----------------------------------------------------------------------------
bool CSceneEntity::IsPlayingSpeech( void )
{
if ( m_pScene )
{
float flTime = m_pScene->GetTime();
for ( int i = 0; i < m_pScene->GetNumEvents(); i++ )
{
CChoreoEvent *e = m_pScene->GetEvent( i );
if ( e->GetType() == CChoreoEvent::SPEAK )
{
if ( /*flTime >= e->GetStartTime() &&*/ flTime <= e->GetEndTime() )
return true;
}
}
}
return false;
}
#endif
//-----------------------------------------------------------------------------
// Purpose:
@@ -2612,6 +2641,30 @@ bool CSceneEntity::CheckActors()
return false;
}
}
#ifdef MAPBASE
else if ( pTestActor->IsPlayer() )
{
// Blixibon - Player speech handling
CBasePlayer *pPlayer = static_cast<CBasePlayer*>(pTestActor);
bool bShouldWait = false;
if ( pPlayer->GetExpresser() && pPlayer->GetExpresser()->IsSpeaking() )
{
bShouldWait = true;
}
else if ( IsTalkingInAScriptedScene( pPlayer ) )
{
bShouldWait = true;
}
if ( bShouldWait )
{
// One of the actors for this scene is talking already.
// Try again next think.
m_bWaitingForActor = true;
return false;
}
}
#endif
}
else if ( m_BusyActor == SCENE_BUSYACTOR_INTERRUPT || m_BusyActor == SCENE_BUSYACTOR_INTERRUPT_CANCEL )
{
@@ -6052,6 +6105,31 @@ bool CSceneManager::IsRunningScriptedSceneWithFlexAndNotPaused( CBaseFlex *pActo
}
bool CSceneManager::IsTalkingInAScriptedScene( CBaseFlex *pActor, bool bIgnoreInstancedScenes )
{
int c = m_ActiveScenes.Count();
for ( int i = 0; i < c; i++ )
{
CSceneEntity *pScene = m_ActiveScenes[ i ].Get();
if ( !pScene ||
!pScene->IsPlayingBack() ||
pScene->IsPaused() ||
( bIgnoreInstancedScenes && dynamic_cast<CInstancedSceneEntity *>(pScene) != NULL )
)
{
continue;
}
if ( pScene->InvolvesActor( pActor ) )
{
if ( pScene->IsPlayingSpeech() )
return true;
}
}
return false;
}
CUtlVector< CHandle< CSceneEntity > > *CSceneManager::GetActiveSceneList()
{
return &m_ActiveScenes;
@@ -6150,6 +6228,11 @@ bool IsRunningScriptedSceneWithFlexAndNotPaused( CBaseFlex *pActor, bool bIgnore
return GetSceneManager()->IsRunningScriptedSceneWithFlexAndNotPaused( pActor, bIgnoreInstancedScenes, pszNotThisScene );
}
bool IsTalkingInAScriptedScene( CBaseFlex *pActor, bool bIgnoreInstancedScenes )
{
return GetSceneManager()->IsTalkingInAScriptedScene( pActor, bIgnoreInstancedScenes );
}
CUtlVector< CHandle< CSceneEntity > > *GetActiveSceneList()
{
return GetSceneManager()->GetActiveSceneList();