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

Replaced expresser cases involving CBaseMultiplayerPlayer with CBasePlayer to allow singleplayer expressers to be obtained

Browse Source
This commit is contained in:
Blixibon 2021-04-07 13:53:06 -05:00
parent bec712f3f9
commit 1a6f1f0cab
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sp/src/game/server/ai_speechqueue.cpp
View File

@ -174,7 +174,11 @@ void CResponseQueue::RemoveExpresserHost(CBaseEntity *host)
/// TODO: Kind of an ugly hack until I get the class hierarchy straightened out. /// TODO: Kind of an ugly hack until I get the class hierarchy straightened out.
static CAI_Expresser *InferExpresserFromBaseEntity(CBaseEntity * RESTRICT pEnt) static CAI_Expresser *InferExpresserFromBaseEntity(CBaseEntity * RESTRICT pEnt)
{ {
#ifdef MAPBASE
if ( CBasePlayer *pPlayer = ToBasePlayer(pEnt) )
#else
if ( CBaseMultiplayerPlayer *pPlayer = dynamic_cast<CBaseMultiplayerPlayer *>(pEnt) ) if ( CBaseMultiplayerPlayer *pPlayer = dynamic_cast<CBaseMultiplayerPlayer *>(pEnt) )
#endif
{ {
return pPlayer->GetExpresser(); return pPlayer->GetExpresser();
} }

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

@ -4835,10 +4835,17 @@ void CSceneEntity::OnSceneFinished( bool canceled, bool fireoutput )
CBaseFlex *pFlex = FindNamedActor( 0 ) ; CBaseFlex *pFlex = FindNamedActor( 0 ) ;
if ( pFlex ) if ( pFlex )
{ {
#ifdef MAPBASE
CBasePlayer *pAsPlayer = ToBasePlayer(pFlex);
#else
CBaseMultiplayerPlayer *pAsPlayer = dynamic_cast<CBaseMultiplayerPlayer *>(pFlex); CBaseMultiplayerPlayer *pAsPlayer = dynamic_cast<CBaseMultiplayerPlayer *>(pFlex);
#endif
if (pAsPlayer) if (pAsPlayer)
{ {
CAI_Expresser *pExpresser = pAsPlayer->GetExpresser(); CAI_Expresser *pExpresser = pAsPlayer->GetExpresser();
#ifdef MAPBASE
if (pExpresser)
#endif
pExpresser->OnSpeechFinished(); pExpresser->OnSpeechFinished();
} }
else if ( CAI_BaseActor *pActor = dynamic_cast<CAI_BaseActor*>( pFlex ) ) else if ( CAI_BaseActor *pActor = dynamic_cast<CAI_BaseActor*>( pFlex ) )