Skip to content

Use proper camera mode for vehicle targets #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2017
Merged

Use proper camera mode for vehicle targets #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Client/mods/deathmatch/logic/CClientCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@ void CClientCamera::DoPulse ( void )
{
if ( !pVehicle )
{
SetFocus ( m_pFocusedPlayer, MODE_BEHINDCAR );
SetFocus ( m_pFocusedPlayer, MODE_CAM_ON_A_STRING );
}
}
else if ( pVehicle )
{
SetFocus ( m_pFocusedPlayer, MODE_BEHINDCAR );
SetFocus ( m_pFocusedPlayer, MODE_CAM_ON_A_STRING );
}
}
else
{
SetFocus ( m_pFocusedPlayer, MODE_BEHINDCAR );
SetFocus ( m_pFocusedPlayer, MODE_CAM_ON_A_STRING );
}
}

Expand Down Expand Up @@ -357,8 +357,7 @@ void CClientCamera::SetFocus ( CClientEntity* pEntity, eCamMode eMode, bool bSmo
}

// Hacky, used to follow peds
//if ( eMode == MODE_CAM_ON_A_STRING && eType == CCLIENTPLAYERMODEL )
if ( eMode == MODE_BEHINDCAR && ( eType == CCLIENTPED || eType == CCLIENTPLAYER ) )
if ( eMode == MODE_CAM_ON_A_STRING && ( eType == CCLIENTPED || eType == CCLIENTPLAYER ) )
eMode = MODE_FOLLOWPED;

// Do it
Expand Down Expand Up @@ -503,7 +502,7 @@ void CClientCamera::RestoreEntity ( CClientEntity* pEntity )
{
if ( m_pFocusedEntity && m_pFocusedEntity == pEntity )
{
SetFocus ( pEntity, MODE_BEHINDCAR );
SetFocus ( pEntity, MODE_CAM_ON_A_STRING );
m_bInvalidated = false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4630,7 +4630,7 @@ bool CStaticFunctionDefinitions::SetCameraTarget ( CClientEntity * pEntity )
// TODO: stream in the player here (needs to be done through the streamer)

// Put the focus on that player
m_pCamera->SetFocus ( pPlayer, MODE_BEHINDCAR, false );
m_pCamera->SetFocus ( pPlayer, MODE_CAM_ON_A_STRING, false );
}
break;
}
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/rpc/CCameraRPCs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void CCameraRPCs::SetCameraTarget ( NetBitStreamInterface& bitStream )
else
{
// Put the focus on that player
m_pCamera->SetFocus ( pPlayer, MODE_BEHINDCAR, false );
m_pCamera->SetFocus ( pPlayer, MODE_CAM_ON_A_STRING, false );
}
break;
}
Expand Down