Cleanups following ff0befb7d2c673b926cbc9bf0bbf8a1e07f2aff6 and 9d63bcaed353f093ad629...

Some of those changes were superfluous (not required by CONTRIBUTING.md)
or didn't fix existing issues.

diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc
index 0dd48716f3e97be57fb7c89ae0c9c613b0b9bf71..b892d6291992bfb4c7ac4ba5599d31b292f2d339 100644 (file)
--- a/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@ -214,7 +214,7 @@ void HUD_StrafeHUD()
                        {
                                trace_dphitq3surfaceflags = 0;
                                tracebox(strafeplayer.origin, strafeplayer.mins, strafeplayer.maxs, strafeplayer.origin - '0 0 1', MOVE_NOMONSTERS, strafeplayer);
-                               onslick = (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK);
+                               onslick = trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK;
                        }
                        real_onslick = onslick;
 

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index dde130da8a2b94420007d646c839e8243c44de38..2863f62d9fe160f50797762a34120c37c2b803a5 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -500,10 +500,8 @@ void HUD_Weapons()
                else
                {
                        if ((it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK))
-                               && !(weapons_stat & WepSet_FromWeapon(it)))
-                       {
+                       && !(weapons_stat & WepSet_FromWeapon(it)))
                                continue;
-                       }
                }
 
                // figure out the drawing position of weapon

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 5f2332c69096896ce639fce443df27d95eca1362..58d497aab77b176a9ef60b951762e60d7eecac95 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -744,7 +744,7 @@ NET_HANDLE(ENT_CLIENT_NAGGER, bool isnew)
                for(int i = 0; i < maxclients;)
                        for(int f = ReadByte(), b = 0; b < 8 && i < maxclients; ++b, ++i)
                                if(playerslots[i])
-                                       playerslots[i].ready = (f & BIT(b));
+                                       playerslots[i].ready = f & BIT(b);
 
        return = true;
 

diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index a61a8bd093b3ec039bc817d2982a71b854c0bdc8..a0923184b0a04a6a998641d2b530df9e86253ddc 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -164,7 +164,7 @@ NET_HANDLE(casings, bool isNew)
 
     return = true;
 
-    casing.silent = (casing.state & 0x80);
+    casing.silent = casing.state & 0x80;
     if ((casing.state & 0x40) && !autocvar_chase_active)
         casing.origin += autocvar_cl_gunoffset.x * v_forward
                        - autocvar_cl_gunoffset.y * v_right

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index d6bc1e6708eefcb4459cbe9eabeeb4b405ce380c..8618dad98859fb7576550a4eb2e9bfabd649e920 100644 (file)
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1563,9 +1563,9 @@ void waypoint_load_hardwiredlinks()
                {
                        waypoint_addlink(wp_from, wp_to);
                        waypoint_mark_hardwiredlink(wp_from, wp_to);
-               } else if ((wp_from.wpflags & WPFLAGMASK_NORELINK)
-                       && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
-                               || (wp_from.wpisbox && (wp_from.wpflags & WAYPOINTFLAG_TELEPORT))))
+               }
+               else if ((wp_from.wpflags & WPFLAGMASK_NORELINK) && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
+               || (wp_from.wpisbox && (wp_from.wpflags & WAYPOINTFLAG_TELEPORT))))
                {
                        waypoint_addlink(wp_from, wp_to);
                }

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index ed8ba9a52e7dbe79a801f088dec2a5a3cc2c845b..23e11ec0098fd2187a863371593fed2f9de3c1c2 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -577,8 +577,8 @@ bool Item_GiveTo(entity item, entity player)
                        Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_ITEM_JETPACK_GOT);
        }
 
-       int its;
-       if((its = (item.items - ((item.items & player.items)) & IT_PICKUPMASK)))
+       int its = (item.items - (item.items & player.items)) & IT_PICKUPMASK;
+       if (its)
        {
                pickedup = true;
                player.items |= its;