YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-12 13:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation.

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-06-14 06:40:02 +05:00
parent ac858f0c2f
commit b510c277ef
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/squeakgrenade.cpp
View File

@ -506,19 +506,7 @@ void CSqueak::PrimaryAttack()
// find place to toss monster
UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20.0f, trace_origin + gpGlobals->v_forward * 64.0f, dont_ignore_monsters, NULL, &tr );
<<<<<<< HEAD
if( tr.fAllSolid == 0.0f && tr.fStartSolid == 0.0f && tr.flFraction > 0.25f )
=======
int flags;
#if CLIENT_WEAPONS
flags = FEV_NOTHOST;
#else
flags = 0;
#endif
PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usSnarkFire, 0.0f, g_vecZero, g_vecZero, 0.0f, 0.0f, 0, 0, 0, 0 );
if( tr.fAllSolid == 0 && tr.fStartSolid == 0 && tr.flFraction > 0.25f )
>>>>>>> master
{
SendWeaponAnim( SQUEAK_THROW );