Fix merge conflicts

[bsdgames-darwin.git] / trek / phaser.c

diff --git a/trek/phaser.c b/trek/phaser.c
index e3cfbfdc438a9b217a795c617cc460aeecf24e2e..6328ee5a265385043bfe65a1eab28885b4c0b8cb 100644 (file)
--- a/trek/phaser.c
+++ b/trek/phaser.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 dholland Exp $     */
+/*     $NetBSD: phaser.c,v 1.15 2009/08/12 08:54:54 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.13 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.15 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -76,7 +76,7 @@ __RCSID("$NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 dholland Exp $");
 **     Uses trace flag 30
 */
 
-struct cvntab  Matab[] = {
+static struct cvntab Matab[] = {
        { "m",          "anual",        (cmdfun) 1,     0 },
        { "a",          "utomatic",     (cmdfun) 0,     0 },
        { NULL,         NULL,           NULL,           0 }
@@ -121,7 +121,8 @@ phaser(int v __unused)
                return;
        }
        if (Ship.cloaked) {
-               printf("Sulu: Captain, surely you must realize that we cannot fire\n");
+               printf("Sulu: Captain, surely you must realize that we cannot "
+                      "fire\n");
                printf("  phasers with the cloaking device up.\n");
                return;
        }
@@ -190,7 +191,8 @@ phaser(int v __unused)
        } else {
                /* automatic distribution of power */
                if (Etc.nkling <= 0) {
-                       printf("Sulu: But there are no Klingons in this quadrant\n");
+                       printf("Sulu: But there are no Klingons in this "
+                              "quadrant\n");
                        return;
                }
                printf("Phasers locked on target.  ");
@@ -215,7 +217,8 @@ phaser(int v __unused)
                                k = &Etc.klingon[i];
                                b = &bank[i];
                                distfactor = k->dist;
-                               anglefactor = ALPHA * BETA * OMEGA / (distfactor * distfactor + EPSILON);
+                               anglefactor = ALPHA * BETA * OMEGA /
+                                       (distfactor * distfactor + EPSILON);
                                anglefactor *= GAMMA;
                                distfactor = k->power;
                                distfactor /= anglefactor;