Novgui voice chat support

cl_dll/CMakeLists.txt

@@ -124,6 +124,8 @@ set (CLDLL_SOURCES
 	tri.cpp
 	util.cpp
 	view.cpp
+	voice_status.cpp
+	../game_shared/voice_banmgr.cpp
 	../game_shared/vcs_info.cpp
 )
 
@@ -140,15 +142,13 @@ if (USE_VGUI)
 		vgui_TeamFortressViewport.cpp
 		vgui_SpectatorPanel.cpp
 		vgui_teammenu.cpp
-		voice_status.cpp
 		../game_shared/vgui_checkbutton2.cpp
 		../game_shared/vgui_grid.cpp
 		../game_shared/vgui_helpers.cpp
 		../game_shared/vgui_listbox.cpp
 		../game_shared/vgui_loadtga.cpp
 		../game_shared/vgui_scrollbar2.cpp
 		../game_shared/vgui_slider2.cpp
-		../game_shared/voice_banmgr.cpp
 		)
 	if (USE_NOVGUI_MOTD)
 		list(APPEND CLDLL_SOURCES MOTD.cpp)

cl_dll/cdll_int.cpp

@@ -354,9 +354,9 @@ Called by engine every frame that client .dll is loaded
 
 void DLLEXPORT HUD_Frame( double time )
 {
-#if USE_VGUI
 	GetClientVoiceMgr()->Frame(time);
-#elif USE_FAKE_VGUI
+
+#if USE_FAKE_VGUI
 	if (!gViewPort)
 		gEngfuncs.VGui_ViewportPaintBackground(HUD_GetRect());
 #else
@@ -374,9 +374,7 @@ Called when a player starts or stops talking.
 
 void DLLEXPORT HUD_VoiceStatus( int entindex, qboolean bTalking )
 {
-#if USE_VGUI
 	GetClientVoiceMgr()->UpdateSpeakerStatus(entindex, bTalking);
-#endif
 }
 
 /*

cl_dll/entity.cpp

@@ -529,9 +529,7 @@ void DLLEXPORT HUD_CreateEntities( void )
 	// Add in any game specific objects
 	Game_AddObjects();
 
-#if USE_VGUI
 	GetClientVoiceMgr()->CreateEntities();
-#endif
 }
 
 /*

cl_dll/hud.cpp

@@ -43,6 +43,18 @@ int g_iUser3 = 0;
 
 #if USE_VGUI
 #include "vgui_ScorePanel.h"
+#endif
+
+// Team Colors
+int iNumberOfTeamColors = 5;
+int iTeamColors[5][3] =
+{
+	{ 255, 170, 0 },	// HL orange (default)
+	{ 125, 165, 210 },	// Blue
+	{ 200, 90, 70 },	// Red
+	{ 225, 205, 45 },	// Yellow
+	{ 145, 215, 140 },	// Green
+};
 
 class CHLVoiceStatusHelper : public IVoiceStatusHelper
 {
@@ -68,26 +80,29 @@ class CHLVoiceStatusHelper : public IVoiceStatusHelper
 		}
 	}
 
+#if USE_VGUI
 	virtual void UpdateCursorState()
 	{
 		gViewPort->UpdateCursorState();
 	}
+#endif
 
 	virtual int	GetAckIconHeight()
 	{
 		return ScreenHeight - gHUD.m_iFontHeight*3 - 6;
 	}
 
+#if USE_VGUI
 	virtual bool			CanShowSpeakerLabels()
 	{
 		if( gViewPort && gViewPort->m_pScoreBoard )
 			return !gViewPort->m_pScoreBoard->isVisible();
 		else
 			return false;
 	}
+#endif
 };
 static CHLVoiceStatusHelper g_VoiceStatusHelper;
-#endif
 
 cvar_t *hud_textmode;
 float g_hud_text_color[3];
@@ -417,6 +432,8 @@ void CHud::Init( void )
 	m_StatusIcons.Init();
 #if USE_VGUI
 	GetClientVoiceMgr()->Init(&g_VoiceStatusHelper, (vgui::Panel**)&gViewPort);
+#else
+	GetClientVoiceMgr()->Init(&g_VoiceStatusHelper);
 #endif
 
 #if !USE_VGUI || USE_NOVGUI_MOTD
@@ -618,9 +635,7 @@ void CHud::VidInit( void )
 	m_AmmoSecondary.VidInit();
 	m_TextMessage.VidInit();
 	m_StatusIcons.VidInit();
-#if USE_VGUI
 	GetClientVoiceMgr()->VidInit();
-#endif
 #if !USE_VGUI || USE_NOVGUI_MOTD
 	m_MOTD.VidInit();
 #endif

cl_dll/hud.h

@@ -93,9 +93,7 @@ struct HUDLIST
 
 //
 //-----------------------------------------------------
-#if USE_VGUI
 #include "voice_status.h" // base voice handling class
-#endif
 #include "hud_spectator.h"
 
 //

cl_dll/scoreboard.cpp

@@ -103,6 +103,7 @@ We have a minimum width of 1-320 - we could have the field widths scale with it?
 #define PING_RANGE_MAX	295
 #define PL_RANGE_MIN 315
 #define PL_RANGE_MAX 375
+#define SPEAKER_POS 40
 
 int SCOREBOARD_WIDTH = 320;
 
@@ -426,6 +427,9 @@ int CHudScoreboard::DrawPlayers( int xpos_rel, float list_slot, int nameoffset,
 			FillRGBA( xpos - 5, ypos, FAR_RIGHT, ROW_GAP, 0, 0, 255, 70 );
 		}
 
+		// draw speaker icon
+		GetClientVoiceMgr()->DrawNoVguiSpeakerIcon( xpos - SPEAKER_POS, ypos - 5, best_player);
+
 		// draw their name (left to right)
 		DrawUtfString( xpos + nameoffset, ypos, NAME_RANGE_MAX + xpos_rel, pl_info->name, r, g, b );
 

cl_dll/vgui_TeamFortressViewport.cpp

@@ -80,15 +80,8 @@ extern float *GetClientColor( int clientIndex );
 using namespace vgui;
 
 // Team Colors
-int iNumberOfTeamColors = 5;
-int iTeamColors[5][3] =
-{
-	{ 255, 170, 0 },	// HL orange (default)
-	{ 125, 165, 210 },	// Blue
-	{ 200, 90, 70 },	// Red
-	{ 225, 205, 45 },	// Yellow
-	{ 145, 215, 140 },	// Green
-};
+extern int iNumberOfTeamColors;
+extern int iTeamColors[5][3];
 
 // Used for Class specific buttons
 const char *sTFClasses[] =