Remove silly superflous parenthesis.
This commit is contained in:
parent
beae3ea770
commit
0d0a305bf3
14 changed files with 31 additions and 31 deletions
|
@ -165,15 +165,14 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
|
|||
return 0;
|
||||
|
||||
/* Find the fleet structure we belong to. */
|
||||
for (fltp = (*head); (fltp && fltp->leader != follow);
|
||||
fltp = fltp->next) ;
|
||||
for (fltp = *head; fltp && fltp->leader != follow; fltp = fltp->next) ;
|
||||
|
||||
if (!fltp) {
|
||||
fltp = malloc(sizeof(*fltp));
|
||||
memset(fltp, 0, sizeof(*fltp));
|
||||
|
||||
/* Fix the links. */
|
||||
fltp->next = (*head);
|
||||
fltp->next = *head;
|
||||
*head = fltp;
|
||||
|
||||
/* Set the leader. */
|
||||
|
@ -265,7 +264,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
|
|||
sp = getshipp(fltp->leader);
|
||||
own = sp->shp_own;
|
||||
fltp_to_list(fltp, &ship_list); /* hack -KHS 1995 */
|
||||
for (s = sp->shp_path; (*s) && (fltp->maxmoves > 0); s++) {
|
||||
for (s = sp->shp_path; *s && fltp->maxmoves > 0; s++) {
|
||||
dir = diridx(*s);
|
||||
if (0 != shp_nav_one_sector(&ship_list, dir, own, 0))
|
||||
fltp->maxmoves = 1;
|
||||
|
|
|
@ -95,7 +95,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
|
|||
vec[I_UW] = maxpop;
|
||||
*workp = (vec[I_CIVIL] * sctwork) / 100.0
|
||||
+ (vec[I_MILIT] * 2 / 5.0) + vec[I_UW];
|
||||
*workp = roundavg((etu * (*workp)) / 100.0);
|
||||
*workp = roundavg((etu * *workp) / 100.0);
|
||||
|
||||
buildeff_work = MIN((int)(*workp / 2), buildeff_work);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue