YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-12 16:07:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix build.

Browse Source
This commit is contained in:
Night Owl 2017-12-25 01:58:43 +05:00
parent 3b15f21264
commit 09690ef1cf
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/ev_hldm.cpp
View File

@ -1423,7 +1423,7 @@ BEAM *pBeam2;
/*
void EV_EgonFire( event_args_t *args )
{
int idx, /*iFireState,*/ iFireMode;
int idx, iFireState, iFireMode;
vec3_t origin;
idx = args->entindex;

7
dlls/python.cpp
View File

@ -227,14 +227,9 @@ void CPython::Reload( void )
#else
bUseScope = g_pGameRules->IsMultiplayer();
#endif
<<<<<<< HEAD
int iResult = DefaultReload( PYTHON_MAX_CLIP, PYTHON_RELOAD, 2.0, bUseScope );
if( iResult )
=======
if( DefaultReload( PYTHON_MAX_CLIP, PYTHON_RELOAD, 2.0, bUseScope ) )
>>>>>>> travis
{
m_flSoundDelay = gpGlobals->time + 1.5;
m_flSoundDelay = 1.5;
}
}

2
dlls/visitors/kevlar.cpp
View File

@ -48,7 +48,7 @@ class CItemKevlar : public CItem
(pPlayer->pev->weapons & (1 << WEAPON_SUIT)))
{
pPlayer->pev->armorvalue += MAX_NORMAL_BATTERY;
pPlayer->pev->armorvalue = min(pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY);
pPlayer->pev->armorvalue = Q_min(pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY);
EMIT_SOUND(pPlayer->edict(), CHAN_ITEM, "player/kevlar_zipper.wav", 1, ATTN_NORM);