FWGS/hlsdk-xash3d
2
0
Fork 0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-12 05:10:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bshift

Browse Source
This commit is contained in:
Andrey Akhmichin 2023-05-01 02:20:57 +05:00
commit 359d239215
No known key found for this signature in database
GPG Key ID: BE329F7886439BC8
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cl_dll/hud.cpp
View File

@ -95,7 +95,6 @@ float g_hud_text_color[3];
extern client_sprite_t *GetSpriteList( client_sprite_t *pList, const char *psz, int iRes, int iCount );
extern cvar_t *sensitivity;
qboolean bIsXash;
cvar_t *cl_lw = NULL;
cvar_t *cl_viewbob = NULL;
cvar_t *cl_rollspeed;
@ -383,18 +382,9 @@ void CHud::Init( void )
m_pCvarStealMouse = CVAR_CREATE( "hud_capturemouse", "1", FCVAR_ARCHIVE );
m_pCvarDraw = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
cl_lw = gEngfuncs.pfnGetCvarPointer( "cl_lw" );
cl_viewbob = CVAR_CREATE( "cl_bobtilt", "0", FCVAR_ARCHIVE );
#if GOLDSOURCE_SUPPORT
if( gEngfuncs.pfnGetCvarPointer( "build" ))
{
bIsXash = true;
}
else
{
cl_viewbob = CVAR_CREATE( "cl_viewbob", "0", FCVAR_ARCHIVE );
cl_rollangle = gEngfuncs.pfnRegisterVariable( "cl_rollangle", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
cl_rollspeed = gEngfuncs.pfnRegisterVariable( "cl_rollspeed", "200", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
}
#endif
m_pSpriteList = NULL;
// Clear any old HUD list

10
cl_dll/view.cpp
View File

@ -313,7 +313,6 @@ void V_AddIdle( struct ref_params_s *pparams )
pparams->viewangles[YAW] += v_idlescale * sin( pparams->time * v_iyaw_cycle.value ) * v_iyaw_level.value;
}
extern qboolean bIsXash;
extern cvar_t *cl_rollspeed;
extern cvar_t *cl_rollangle;
@ -332,14 +331,9 @@ void V_CalcViewRoll( struct ref_params_s *pparams )
viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
if( !viewentity )
return;
#if GOLDSOURCE_SUPPORT
if( bIsXash )
side = V_CalcRoll( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
else
side = V_CalcRoll( viewentity->angles, pparams->simvel, cl_rollangle->value, cl_rollspeed->value );
#else
side = V_CalcRoll( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
#endif
pparams->viewangles[ROLL] += side;
if( pparams->health <= 0 && ( pparams->viewheight[2] != 0 ) )