Fix build.

cl_dll/CMakeLists.txt

@@ -198,7 +198,7 @@ else()
 		scoreboard.cpp)
 endif()
 
-include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public  aghl ../dlls/aghl)
+include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public  aghl ../dlls/aghl ..)
 
 if (USE_VGUI)
 	SET(CMAKE_SKIP_RPATH TRUE)

cl_dll/cdll_int.cpp

@@ -388,7 +388,6 @@ void DLLEXPORT HUD_Frame( double time )
 #if AG_USE_CHEATPROTECTION
 	g_VariableChecker.Check();
 #endif //AG_USE_CHEATPROTECTION
-#if USE_VGUI_FOR_GOLDSOURCE_SUPPORT
 #if USE_VGUI
 	GetClientVoiceMgr()->Frame(time);
 #elif USE_FAKE_VGUI

cl_dll/hud.cpp

@@ -96,7 +96,7 @@ extern client_sprite_t *GetSpriteList( client_sprite_t *pList, const char *psz,
 
 extern cvar_t *sensitivity;
 cvar_t *cl_lw = NULL;
-int g_IsSpectator[MAX_PLAYERS + 1];
+// int g_IsSpectator[MAX_PLAYERS + 1];
 cvar_t *cl_viewbob = NULL;
 
 void ShutdownInput( void );

cl_dll/hud_redraw.cpp

@@ -21,16 +21,14 @@
 #include "cl_util.h"
 //#include "triangleapi.h"
 
-<<<<<<< HEAD
+#if USE_VGUI
+#include "vgui_TeamFortressViewport.h"
+#endif
+
 //++ BulliT
 #include <demo_api.h>
 #include "agmatchreport.h"
 //-- Martin Webrant
-=======
-#if USE_VGUI
-#include "vgui_TeamFortressViewport.h"
-#endif
->>>>>>> master
 
 #define MAX_LOGO_FRAMES 56
 
@@ -110,9 +108,6 @@ int CHud::Redraw( float flTime, int intermission )
 	if( m_flTimeDelta < 0 )
 		m_flTimeDelta = 0;
 
-<<<<<<< HEAD
-	if( m_iIntermission && !intermission )
-=======
 #if USE_VGUI
 	// Bring up the scoreboard during intermission
 	if (gViewPort)
@@ -141,7 +136,6 @@ int CHud::Redraw( float flTime, int intermission )
 	}
 #else
 	if( !m_iIntermission && intermission )
->>>>>>> master
 	{
 //++ BulliT
 		//Stop recording the demo.