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:58:31 +05:00
parent 67f052e7c0
commit 93be84a741
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cl_dll/ev_hldm.cpp
View File

@ -507,7 +507,7 @@ void EV_FireShotGunDouble( event_args_t *args )
int i;
vec3_t vecSrc, vecAiming;
//vec3_t vecSpread;
vec3_t vecSpread;
vec3_t up, right, forward;
float flSpread = 0.01;
@ -546,7 +546,7 @@ void EV_FireShotGunSingle( event_args_t *args )
int i;
vec3_t vecSrc, vecAiming;
//vec3_t vecSpread;
vec3_t vecSpread;
vec3_t up, right, forward;
float flSpread = 0.01;

22
cl_dll/hud.cpp
View File

@ -324,14 +324,6 @@ int __MsgFunc_AllowSpec( const char *pszName, int iSize, void *pbuf )
return 0;
}
void __CmdFunc_CloseCommandMenu(void)
{
}
void __CmdFunc_ForceCloseCommandMenu( void )
{
}
// This is called every time the DLL is loaded
void CHud::Init( void )
{
@ -342,8 +334,6 @@ void CHud::Init( void )
HOOK_MESSAGE( SetFOV );
HOOK_MESSAGE( Concuss );
HOOK_COMMAND( "togglebrowser", ToggleServerBrowser );
HOOK_MESSAGE( ServerName );
HOOK_COMMAND( "+commandmenu", OpenCommandMenu );
@ -439,6 +429,8 @@ void CHud::Init( void )
m_AmmoSecondary.Init();
m_TextMessage.Init();
m_StatusIcons.Init();
m_FlagStat.Init();
m_Bonus.Init();
#if USE_VGUI
GetClientVoiceMgr()->Init(&g_VoiceStatusHelper, (vgui::Panel**)&gViewPort);
#endif
@ -448,12 +440,7 @@ void CHud::Init( void )
#endif
#if !USE_VGUI || USE_NOVGUI_SCOREBOARD
m_Scoreboard.Init();
<<<<<<< HEAD
m_FlagStat.Init();
m_Bonus.Init();
=======
#endif
>>>>>>> master
m_Menu.Init();
@ -633,13 +620,9 @@ void CHud::VidInit( void )
m_AmmoSecondary.VidInit();
m_TextMessage.VidInit();
m_StatusIcons.VidInit();
<<<<<<< HEAD
m_Spectator.VidInit();
m_Scoreboard.VidInit();
m_MOTD.VidInit();
m_FlagStat.VidInit();
m_Bonus.VidInit();
=======
#if USE_VGUI
GetClientVoiceMgr()->VidInit();
#endif
@ -649,7 +632,6 @@ void CHud::VidInit( void )
#if !USE_VGUI || USE_NOVGUI_SCOREBOARD
m_Scoreboard.VidInit();
#endif
>>>>>>> master
}
int CHud::MsgFunc_Logo( const char *pszName, int iSize, void *pbuf )

1
cl_dll/hud_spectator.cpp
View File

@ -141,7 +141,6 @@ void ToggleScores( void )
#endif
}
>>>>>>> master
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------