MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-25 05:01:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed point_viewcontrol "Don't set player view" keyvalue not working properly

Browse Source
This commit is contained in:
Blixibon 2021-09-20 22:10:34 -05:00
parent 4d4296dac2
commit f278491d86
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sp/src/game/server/triggers.cpp
View File

@ -3497,6 +3497,7 @@ void CTriggerCamera::Enable( void )
#ifdef MAPBASE #ifdef MAPBASE
if (!m_bDontSetPlayerView) if (!m_bDontSetPlayerView)
#endif #endif
{
pPlayer->SetViewEntity( this ); pPlayer->SetViewEntity( this );
// Hide the player's viewmodel // Hide the player's viewmodel
@ -3504,6 +3505,7 @@ void CTriggerCamera::Enable( void )
{ {
pPlayer->GetActiveWeapon()->AddEffects( EF_NODRAW ); pPlayer->GetActiveWeapon()->AddEffects( EF_NODRAW );
} }
}
// Only track if we have a target // Only track if we have a target
if ( m_hTarget ) if ( m_hTarget )
@ -3548,12 +3550,17 @@ void CTriggerCamera::Disable( void )
pBasePlayer->RemoveSolidFlags( FSOLID_NOT_SOLID ); pBasePlayer->RemoveSolidFlags( FSOLID_NOT_SOLID );
} }
if (!m_bDontSetPlayerView) if ( HasSpawnFlags( SF_CAMERA_PLAYER_TAKECONTROL ) )
pBasePlayer->SetViewEntity( NULL ); {
pBasePlayer->EnableControl( TRUE );
}
pBasePlayer->EnableControl(TRUE); if (!m_bDontSetPlayerView)
{
pBasePlayer->SetViewEntity( NULL );
pBasePlayer->m_Local.m_bDrawViewmodel = true; pBasePlayer->m_Local.m_bDrawViewmodel = true;
} }
}
if ( HasSpawnFlags( SF_CAMERA_PLAYER_SETFOV ) ) if ( HasSpawnFlags( SF_CAMERA_PLAYER_SETFOV ) )
{ {