forked from valve/halflife-sdk
server: fix parentheses with bool ops
This commit is contained in:
parent
98ce99e822
commit
7ae4e0e200
3 changed files with 3 additions and 3 deletions
|
@ -520,7 +520,7 @@ void CBaseDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use
|
||||||
{
|
{
|
||||||
m_hActivator = pActivator;
|
m_hActivator = pActivator;
|
||||||
// if not ready to be used, ignore "use" command.
|
// if not ready to be used, ignore "use" command.
|
||||||
if (m_toggle_state == TS_AT_BOTTOM || FBitSet(pev->spawnflags, SF_DOOR_NO_AUTO_RETURN) && m_toggle_state == TS_AT_TOP)
|
if (m_toggle_state == TS_AT_BOTTOM || ( FBitSet(pev->spawnflags, SF_DOOR_NO_AUTO_RETURN) && m_toggle_state == TS_AT_TOP ))
|
||||||
DoorActivate();
|
DoorActivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -676,7 +676,7 @@ void CHalfLifeMultiplay :: PlayerSpawn( CBasePlayer *pPlayer )
|
||||||
|
|
||||||
addDefault = TRUE;
|
addDefault = TRUE;
|
||||||
|
|
||||||
while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ))
|
while (( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )))
|
||||||
{
|
{
|
||||||
pWeaponEntity->Touch( pPlayer );
|
pWeaponEntity->Touch( pPlayer );
|
||||||
addDefault = FALSE;
|
addDefault = FALSE;
|
||||||
|
|
|
@ -1113,7 +1113,7 @@ void CBaseTrigger :: MultiTouch( CBaseEntity *pOther )
|
||||||
// Only touch clients, monsters, or pushables (depending on flags)
|
// Only touch clients, monsters, or pushables (depending on flags)
|
||||||
if ( ((pevToucher->flags & FL_CLIENT) && !(pev->spawnflags & SF_TRIGGER_NOCLIENTS)) ||
|
if ( ((pevToucher->flags & FL_CLIENT) && !(pev->spawnflags & SF_TRIGGER_NOCLIENTS)) ||
|
||||||
((pevToucher->flags & FL_MONSTER) && (pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS)) ||
|
((pevToucher->flags & FL_MONSTER) && (pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS)) ||
|
||||||
(pev->spawnflags & SF_TRIGGER_PUSHABLES) && FClassnameIs(pevToucher,"func_pushable") )
|
((pev->spawnflags & SF_TRIGGER_PUSHABLES) && FClassnameIs(pevToucher,"func_pushable")) )
|
||||||
{
|
{
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
Loading…
Reference in a new issue