Novgui voice chat support

cl_dll/CMakeLists.txt

@@ -124,11 +124,13 @@ set (CLDLL_SOURCES
 	tri.cpp
 	util.cpp
 	view.cpp
+	../game_shared/voice_banmgr.cpp
 	../game_shared/vcs_info.cpp
 )
 
 if (USE_VGUI)
 	list(APPEND CLDLL_SOURCES
+		voice_status.cpp
 		vgui_int.cpp
 		vgui_ClassMenu.cpp
 		vgui_ConsolePanel.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)
@@ -159,7 +159,8 @@ if (USE_VGUI)
 else()
 	list(APPEND CLDLL_SOURCES
 		MOTD.cpp
-		scoreboard.cpp)
+		scoreboard.cpp
+		novgui_voice_status.cpp)
 endif()
 
 include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)

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

@@ -417,6 +417,8 @@ void CHud::Init( void )
 	m_StatusIcons.Init();
 #if USE_VGUI
 	GetClientVoiceMgr()->Init(&g_VoiceStatusHelper, (vgui::Panel**)&gViewPort);
+#else
+	GetClientVoiceMgr()->Init();
 #endif
 
 #if !USE_VGUI || USE_NOVGUI_MOTD
@@ -618,9 +620,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

@@ -95,6 +95,8 @@ struct HUDLIST
 //-----------------------------------------------------
 #if USE_VGUI
 #include "voice_status.h" // base voice handling class
+#else
+#include "novgui_voice_status.h"
 #endif
 #include "hud_spectator.h"