empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some redundant parenthesis; no functional change.

Browse source
This commit is contained in:
Markus Armbruster 2005-10-02 10:16:19 +00:00
parent 745bdf7fd1
commit ad84132688
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/aircombat.c
View file

@ -195,7 +195,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
evaded = do_evade(bomb_list, 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 /* We only show planes overhead if they didn't
* evade radar */ * evade radar */
overfly[sect.sct_own]++; 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 */ /* mission planes aborted due to flak -- don't send escorts */
if (QEMPTY(bomb_list)) if (QEMPTY(bomb_list))
break; break;
if ((!no_air_defense) && (!evaded)) if (!no_air_defense && !evaded)
air_defense(x, y, plane_owner, bomb_list, esc_list); air_defense(x, y, plane_owner, bomb_list, esc_list);
if (sect.sct_own == 0 || sect.sct_own == plane_owner) if (sect.sct_own == 0 || sect.sct_own == plane_owner)

2
src/lib/subs/fortdef.c
View file

@ -92,7 +92,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
continue; continue;
if (ship.shp_effic < 60) if (ship.shp_effic < 60)
continue; continue;
if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && (!usesubs)) if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && !usesubs)
continue; continue;
range = techfact(ship.shp_tech, range = techfact(ship.shp_tech,
ship.shp_frnge * ship.shp_effic / 200.0); ship.shp_frnge * ship.shp_effic / 200.0);

4
src/lib/subs/retreat.c
View file

@ -227,7 +227,7 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig)
n = (-1 * MAX_RETREAT); n = (-1 * MAX_RETREAT);
stopping = 0; stopping = 0;
time_to_stop = 0; time_to_stop = 0;
while ((!stopping) && n) { while (!stopping && n) {
dx = dy = 0; dx = dy = 0;
if (sp->shp_rpath[0] == 0 || sp->shp_rpath[0] == 0) { if (sp->shp_rpath[0] == 0 || sp->shp_rpath[0] == 0) {
stopping = 1; stopping = 1;
@ -453,7 +453,7 @@ retreat_land1(struct lndstr *lp, s_char code, int orig)
n = (-1 * MAX_RETREAT); n = (-1 * MAX_RETREAT);
stopping = 0; stopping = 0;
time_to_stop = 0; time_to_stop = 0;
while ((!stopping) && n) { while (!stopping && n) {
dx = dy = 0; dx = dy = 0;
if (lp->lnd_rpath[0] == 0 || lp->lnd_rpath[0] == 0) { if (lp->lnd_rpath[0] == 0 || lp->lnd_rpath[0] == 0) {
stopping = 1; stopping = 1;

2
src/lib/update/sail.c
View file

@ -135,7 +135,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
return 0; return 0;
} }
for (stop = 0, cp = ap->shp_path; (!stop) && (*cp); cp++) { for (stop = 0, cp = ap->shp_path; !stop && *cp; cp++) {
switch (*cp) { switch (*cp) {
case 'y': case 'y':
case 'u': case 'u':