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:
mittorn 2016-06-12 09:34:55 +00:00
parent b02e02d6ff
commit af5b38cbbd
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/teamplay_gamerules.cpp
View File

@ -149,7 +149,7 @@ void CHalfLifeTeamplay :: Think ( void )
//=========================================================
BOOL CHalfLifeTeamplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{
#ifdef NO_VOICEGAMEMGR
#ifndef NO_VOICEGAMEMGR
if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
return TRUE;
#endif

35
dlls/weapons.cpp
View File

@ -538,28 +538,23 @@ void CBasePlayerItem::Materialize( void )
}
float CBasePlayerItem::TouchGravGun( CBaseEntity *attacker, int stage )
{
if( stage == 2 )
{
if( stage == 2 )
{
if( (attacker->pev->origin - pev->origin ).Length() < 90 )
Touch( attacker );
}
if( pev->movetype == MOVETYPE_FOLLOW )
return 0;
if( pev->movetype == MOVETYPE_NONE )
return 0;
if( pev->effects & EF_NODRAW )
return 0;
SetThink( &CBasePlayerItem::AttemptToMaterialize );
pev->nextthink = gpGlobals->time + 60;;
//if( pev->mins == pev->maxs )
//return 0;
return 200;
if( (attacker->pev->origin - pev->origin ).Length() < 90 )
Touch( attacker );
}
UTIL_SetOrigin( pev, pev->origin );// link into world.
SetTouch( &CBasePlayerItem::DefaultTouch);
SetThink( NULL );
if( pev->movetype == MOVETYPE_FOLLOW )
return 0;
if( pev->movetype == MOVETYPE_NONE )
return 0;
if( pev->effects & EF_NODRAW )
return 0;
SetThink( &CBasePlayerItem::AttemptToMaterialize );
pev->nextthink = gpGlobals->time + 60;;
//if( pev->mins == pev->maxs )
//return 0;
return 200;
}
//=========================================================