From 927a087250c6d788d6df6cc7fcb0359653e2efd3 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 24 May 2009 21:44:56 +0000 Subject: KNF: brace and comment placement. Object files identical. --- trek/phaser.c | 95 ++++++++++++++++++++--------------------------------------- 1 file changed, 32 insertions(+), 63 deletions(-) (limited to 'trek/phaser.c') diff --git a/trek/phaser.c b/trek/phaser.c index 8931cdb5..e3cfbfdc 100644 --- a/trek/phaser.c +++ b/trek/phaser.c @@ -1,4 +1,4 @@ -/* $NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $ */ +/* $NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $"); +__RCSID("$NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 dholland Exp $"); #endif #endif /* not lint */ @@ -76,15 +76,13 @@ __RCSID("$NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $"); ** Uses trace flag 30 */ -struct cvntab Matab[] = -{ +struct cvntab Matab[] = { { "m", "anual", (cmdfun) 1, 0 }, { "a", "utomatic", (cmdfun) 0, 0 }, { NULL, NULL, NULL, 0 } }; -struct banks -{ +struct banks { int units; double angle; double spread; @@ -122,8 +120,7 @@ phaser(int v __unused) printf("Sulu: Captain, we cannot fire through shields.\n"); return; } - if (Ship.cloaked) - { + if (Ship.cloaked) { printf("Sulu: Captain, surely you must realize that we cannot fire\n"); printf(" phasers with the cloaking device up.\n"); return; @@ -131,30 +128,23 @@ phaser(int v __unused) /* decide if we want manual or automatic mode */ manual = 0; - if (testnl()) - { - if (damaged(COMPUTER)) - { + if (testnl()) { + if (damaged(COMPUTER)) { printf("%s", Device[COMPUTER].name); manual++; + } else if (damaged(SRSCAN)) { + printf("%s", Device[SRSCAN].name); + manual++; } - else - if (damaged(SRSCAN)) - { - printf("%s", Device[SRSCAN].name); - manual++; - } if (manual) printf(" damaged, manual mode selected\n"); } - if (!manual) - { + if (!manual) { ptr = getcodpar("Manual or automatic", Matab); manual = (long) ptr->value; } - if (!manual && damaged(COMPUTER)) - { + if (!manual && damaged(COMPUTER)) { printf("Computer damaged, manual selected\n"); skiptonl(0); manual++; @@ -164,16 +154,13 @@ phaser(int v __unused) flag = 1; for (i = 0; i < NBANKS; i++) bank[i].units = 0; - if (manual) - { + if (manual) { /* collect manual mode statistics */ - while (flag) - { + while (flag) { printf("%d units available\n", Ship.energy); extra = 0; flag = 0; - for (i = 0; i < NBANKS; i++) - { + for (i = 0; i < NBANKS; i++) { b = &bank[i]; printf("\nBank %d:\n", i); hit = getintpar("units"); @@ -182,8 +169,7 @@ phaser(int v __unused) if (hit == 0) break; extra += hit; - if (extra > Ship.energy) - { + if (extra > Ship.energy) { printf("available energy exceeded. "); skiptonl(0); flag++; @@ -201,23 +187,19 @@ phaser(int v __unused) Ship.energy -= extra; } extra = 0; - } - else - { + } else { /* automatic distribution of power */ if (Etc.nkling <= 0) { printf("Sulu: But there are no Klingons in this quadrant\n"); return; } printf("Phasers locked on target. "); - while (flag) - { + while (flag) { printf("%d units available\n", Ship.energy); hit = getintpar("Units to fire"); if (hit <= 0) return; - if (hit > Ship.energy) - { + if (hit > Ship.energy) { printf("available energy exceeded. "); skiptonl(0); continue; @@ -229,8 +211,7 @@ phaser(int v __unused) if (n > NBANKS) n = NBANKS; tot = n * (n + 1) / 2; - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { k = &Etc.klingon[i]; b = &bank[i]; distfactor = k->dist; @@ -245,8 +226,7 @@ phaser(int v __unused) b->spread = 0.0; b->units = ((n - i) / tot) * extra; #ifdef xTRACE - if (Trace) - { + if (Trace) { printf("b%d hr%d u%d df%.2f af%.2f\n", i, hitreqd[i], b->units, distfactor, anglefactor); @@ -254,24 +234,20 @@ phaser(int v __unused) #endif extra -= b->units; hit = b->units - hitreqd[i]; - if (hit > 0) - { + if (hit > 0) { extra += hit; b->units -= hit; } } /* give out any extra energy we might have around */ - if (extra > 0) - { - for (i = 0; i < n; i++) - { + if (extra > 0) { + for (i = 0; i < n; i++) { b = &bank[i]; hit = hitreqd[i] - b->units; if (hit <= 0) continue; - if (hit >= extra) - { + if (hit >= extra) { b->units += extra; extra = 0; break; @@ -286,10 +262,8 @@ phaser(int v __unused) } #ifdef xTRACE - if (Trace) - { - for (i = 0; i < NBANKS; i++) - { + if (Trace) { + for (i = 0; i < NBANKS; i++) { b = &bank[i]; printf("b%d u%d", i, b->units); if (b->units > 0) @@ -302,18 +276,15 @@ phaser(int v __unused) /* actually fire the shots */ Move.free = 0; - for (i = 0; i < NBANKS; i++) - { + for (i = 0; i < NBANKS; i++) { b = &bank[i]; - if (b->units <= 0) - { + if (b->units <= 0) { continue; } printf("\nPhaser bank %d fires:\n", i); n = Etc.nkling; k = Etc.klingon; - for (j = 0; j < n; j++) - { + for (j = 0; j < n; j++) { if (b->units <= 0) break; /* @@ -355,8 +326,7 @@ phaser(int v __unused) dy = k->y - Ship.secty; anglefactor = atan2(dy, dx) - b->angle; anglefactor = cos((anglefactor * b->spread) + GAMMA); - if (anglefactor < 0.0) - { + if (anglefactor < 0.0) { k++; continue; } @@ -367,8 +337,7 @@ phaser(int v __unused) printf(" at %d,%d", k->x, k->y); printf("\n"); b->units -= hit; - if (k->power <= 0) - { + if (k->power <= 0) { killk(k->x, k->y); continue; } -- cgit v1.2.3-56-ge451