FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build.

This commit is contained in:
Andrey Akhmichin 2022-06-08 05:38:00 +05:00
parent ba9fc7fb80
commit 6e8c3a6e9c
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/CMakeLists.txt
View File

@ -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)

1
cl_dll/cdll_int.cpp
View File

@ -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

2
cl_dll/hud.cpp
View File

@ -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 );

14
cl_dll/hud_redraw.cpp
View File

@ -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.