edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6916 from Vy0x2/pr-poc-mv-clean

Browse source 
Minor improvements to Multi-View
This commit is contained in:
Robert Müller 2023-07-28 15:00:42 +00:00 committed by GitHub
parent 88cf4c4ccb 1c231a0dbd
commit 5b10547aec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/spectator.cpp
View file

@ -217,7 +217,7 @@ void CSpectator::OnRender()
if(!GameClient()->m_MultiViewActivated)
Spectate(m_SelectedSpectatorID);
if(GameClient()->m_MultiViewActivated && m_pClient->m_Teams.Team(m_SelectedSpectatorID) != GameClient()->m_MultiViewTeam)
if(GameClient()->m_MultiViewActivated && m_SelectedSpectatorID != MULTI_VIEW && m_pClient->m_Teams.Team(m_SelectedSpectatorID) != GameClient()->m_MultiViewTeam)
{
GameClient()->ResetMultiView();
Spectate(m_SelectedSpectatorID);

39
src/game/client/gameclient.cpp
View file

@ -635,6 +635,8 @@ void CGameClient::UpdatePositions()
if(!m_MultiViewActivated && m_MultiView.m_IsInit)
ResetMultiView();
else if(!m_Snap.m_SpecInfo.m_Active)
m_MultiViewPersonalZoom = 0;
UpdateRenderedCharacters();
}
@ -874,29 +876,25 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
m_GameWorld.ReleaseHooked(pMsg->m_Victim);
}
// if we are spectating a static id set (team 0) and somebody killed, we remove him from the list
if(IsMultiViewIdSet() && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec)
// if we are spectating a static id set (team 0) and somebody killed, and its not a guy in solo, we remove him from the list
if(IsMultiViewIdSet() && m_MultiViewTeam == 0 && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec && !m_MultiView.m_Solo)
{
// is multi-view even activated and we are not spectating a solo guy
if(m_MultiViewActivated && !m_MultiView.m_Solo)
{
m_aMultiViewId[pMsg->m_Victim] = false;
m_aMultiViewId[pMsg->m_Victim] = false;
// if everyone of a team killed, we have no ids to spectate anymore, so we disable multi-view
if(!IsMultiViewIdSet())
m_MultiViewActivated = false;
else
// if everyone of a team killed, we have no ids to spectate anymore, so we disable multi view
if(!IsMultiViewIdSet())
m_MultiViewActivated = false;
else
{
// the "main" tee killed, search a new one
if(m_Snap.m_SpecInfo.m_SpectatorID == pMsg->m_Victim)
{
// the "main" tee killed, search a new one
if(m_Snap.m_SpecInfo.m_SpectatorID == pMsg->m_Victim)
int NewClientID = FindFirstMultiViewId();
if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
{
int NewClientID = FindFirstMultiViewId();
if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
{
CleanMultiViewId(NewClientID);
m_aMultiViewId[NewClientID] = true;
m_Spectator.Spectate(NewClientID);
}
CleanMultiViewId(NewClientID);
m_aMultiViewId[NewClientID] = true;
m_Spectator.Spectate(NewClientID);
}
}
}
@ -3527,6 +3525,9 @@ void CGameClient::HandleMultiView()
else if(m_MultiView.m_SecondChance != 0.0f)
m_MultiView.m_SecondChance = 0.0f;
// if we only have one tee thats in the list, we activate solo-mode
m_MultiView.m_Solo = std::count(std::begin(m_aMultiViewId), std::end(m_aMultiViewId), true) == 1;
vec2 TargetPos = vec2((Minpos.x + Maxpos.x) / 2.0f, (Minpos.y + Maxpos.y) / 2.0f);
// dont hide the position hud if its only one player
m_MultiViewShowHud = AmountPlayers == 1;

6
src/game/variables.h
View file

@ -90,9 +90,9 @@ MACRO_CONFIG_INT(ClDyncamFollowFactor, cl_dyncam_follow_factor, 60, 0, 200, CFGF
MACRO_CONFIG_INT(ClDyncamSmoothness, cl_dyncam_smoothness, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Transition amount of the camera movement, 0=instant, 100=slow and smooth")
MACRO_CONFIG_INT(ClDyncamStabilizing, cl_dyncam_stabilizing, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Amount of camera slowdown during fast cursor movement. High value can cause delay in camera movement")
MACRO_CONFIG_INT(ClMultiViewSensitivity, cl_multiview_sensitivity, 100, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Set how fast the camera will move to the desired location (higher = faster)")
MACRO_CONFIG_INT(ClMultiViewUseFreeView, cl_multiview_use_freeview, 0, 1, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Use the free-view mode when using multi-view from free-view (/showall 1 has to be activated)")
MACRO_CONFIG_INT(ClMultiViewZoomSmoothness, cl_multiview_zoom_smoothness, 1300, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Set the smoothness of the multi-view zoom (in ms, higher = slower)")
MACRO_CONFIG_INT(ClMultiViewSensitivity, cl_multiview_sensitivity, 100, 0, 200, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set how fast the camera will move to the desired location (higher = faster)")
MACRO_CONFIG_INT(ClMultiViewUseFreeView, cl_multiview_use_freeview, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Use the free-view mode when using multi-view from free-view (/showall 1 has to be activated)")
MACRO_CONFIG_INT(ClMultiViewZoomSmoothness, cl_multiview_zoom_smoothness, 1300, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set the smoothness of the multi-view zoom (in ms, higher = slower)")
MACRO_CONFIG_INT(EdAutosaveInterval, ed_autosave_interval, 10, 0, 240, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interval in minutes at which a copy of the current editor map is automatically saved to the 'auto' folder (0 for off)")
MACRO_CONFIG_INT(EdAutosaveMax, ed_autosave_max, 10, 0, 1000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of autosaves that are kept per map name (0 = no limit)")