From ad84132688b2e9d1746afa740be73d838c15461b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 2 Oct 2005 10:16:19 +0000 Subject: [PATCH] Remove some redundant parenthesis; no functional change. --- src/lib/subs/aircombat.c | 4 ++-- src/lib/subs/fortdef.c | 2 +- src/lib/subs/retreat.c | 4 ++-- src/lib/update/sail.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index bbb0ba4da..c8ac876cd 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -195,7 +195,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list, evaded = do_evade(bomb_list, esc_list); - if (sect.sct_own != 0 && sect.sct_own != plane_owner && (!evaded)) { + if (sect.sct_own != 0 && sect.sct_own != plane_owner && !evaded) { /* We only show planes overhead if they didn't * evade radar */ overfly[sect.sct_own]++; @@ -216,7 +216,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list, /* mission planes aborted due to flak -- don't send escorts */ if (QEMPTY(bomb_list)) break; - if ((!no_air_defense) && (!evaded)) + if (!no_air_defense && !evaded) air_defense(x, y, plane_owner, bomb_list, esc_list); if (sect.sct_own == 0 || sect.sct_own == plane_owner) diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c index c8c749015..8cb328e5f 100644 --- a/src/lib/subs/fortdef.c +++ b/src/lib/subs/fortdef.c @@ -92,7 +92,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending, continue; if (ship.shp_effic < 60) continue; - if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && (!usesubs)) + if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && !usesubs) continue; range = techfact(ship.shp_tech, ship.shp_frnge * ship.shp_effic / 200.0); diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 120f3cf21..94652ecad 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -227,7 +227,7 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig) n = (-1 * MAX_RETREAT); stopping = 0; time_to_stop = 0; - while ((!stopping) && n) { + while (!stopping && n) { dx = dy = 0; if (sp->shp_rpath[0] == 0 || sp->shp_rpath[0] == 0) { stopping = 1; @@ -453,7 +453,7 @@ retreat_land1(struct lndstr *lp, s_char code, int orig) n = (-1 * MAX_RETREAT); stopping = 0; time_to_stop = 0; - while ((!stopping) && n) { + while (!stopping && n) { dx = dy = 0; if (lp->lnd_rpath[0] == 0 || lp->lnd_rpath[0] == 0) { stopping = 1; diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c index dba8d5061..c17de02ac 100644 --- a/src/lib/update/sail.c +++ b/src/lib/update/sail.c @@ -135,7 +135,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp) return 0; } - for (stop = 0, cp = ap->shp_path; (!stop) && (*cp); cp++) { + for (stop = 0, cp = ap->shp_path; !stop && *cp; cp++) { switch (*cp) { case 'y': case 'u': -- 2.43.0