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

Merge branch 'poke646' into poke646_vendetta

This commit is contained in:
Andrey Akhmichin 2022-08-24 19:25:20 +05:00
parent 689d32b225 4b288b889c
commit ed7d3f620d
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cl_dll/hl/hl_weapons.cpp
View File

@ -793,16 +793,8 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
// over the wire ( fixes some animation glitches )
if( g_runfuncs && ( HUD_GetWeaponAnim() != to->client.weaponanim ) )
{
<<<<<<< HEAD
int body = 2;
=======
int body = 0;
//Show laser sight/scope combo
if( pWeapon == &g_Python && bIsMultiplayer() )
body = 1;
>>>>>>> master
// Force a fixed anim down to viewmodel
HUD_SendWeaponAnim( to->client.weaponanim, body, 1 );
}