From 7ae4e0e200b9f6f31dc59d1ed798fa422ee34279 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 6 Sep 2023 05:14:47 +0300 Subject: [PATCH] server: fix parentheses with bool ops --- dlls/doors.cpp | 2 +- dlls/game_deathmatch.cpp | 2 +- dlls/triggers.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/doors.cpp b/dlls/doors.cpp index 2e6e78b..ecb750c 100644 --- a/dlls/doors.cpp +++ b/dlls/doors.cpp @@ -520,7 +520,7 @@ void CBaseDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use { m_hActivator = pActivator; // 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(); } diff --git a/dlls/game_deathmatch.cpp b/dlls/game_deathmatch.cpp index a6e91ee..5d0e1b5 100644 --- a/dlls/game_deathmatch.cpp +++ b/dlls/game_deathmatch.cpp @@ -676,7 +676,7 @@ void CHalfLifeMultiplay :: PlayerSpawn( CBasePlayer *pPlayer ) addDefault = TRUE; - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while (( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ))) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; diff --git a/dlls/triggers.cpp b/dlls/triggers.cpp index 1462202..acb32d3 100644 --- a/dlls/triggers.cpp +++ b/dlls/triggers.cpp @@ -1113,7 +1113,7 @@ void CBaseTrigger :: MultiTouch( CBaseEntity *pOther ) // Only touch clients, monsters, or pushables (depending on flags) if ( ((pevToucher->flags & FL_CLIENT) && !(pev->spawnflags & SF_TRIGGER_NOCLIENTS)) || ((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