Merge pull request ddnet#8711 from def-/pr-show-kill

Show game menu buttons again, even in 5:4, when not on a red/blue-team server
Robyt3 · Aug 12, 2024 · 26cccb7 · 26cccb7
2 parents bd92dbd + 96881de
commit 26cccb7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
@@ -186,7 +186,7 @@ void CMenus::RenderGame(CUIRect MainView)
  }
  }
 
- if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS && ShowDDRaceButtons)
+ if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)))
  {
  ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
  ButtonBar.VSplitLeft(65.0f, &Button, &ButtonBar);
@@ -200,7 +200,7 @@ void CMenus::RenderGame(CUIRect MainView)
  }
  }
 
- if(m_pClient->m_ReceivedDDNetPlayer && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && ShowDDRaceButtons)
+ if(m_pClient->m_ReceivedDDNetPlayer && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)))
  {
  if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS || Paused || Spec)
  {