]> git.cameronkatri.com Git - bsdgames-darwin.git/blobdiff - trek/computer.c
Pass -Wstrict-overflow.
[bsdgames-darwin.git] / trek / computer.c
index fba590ad32ba0ce910b6e2f77aca4dd4e616532e..2b3e0522bfc661d24c1db49b52faf573e16b2cd8 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: computer.c,v 1.3 1995/04/22 10:58:39 cgd Exp $ */
+/*     $NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: computer.c,v 1.3 1995/04/22 10:58:39 cgd Exp $";
+__RCSID("$NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
-# include      "getpar.h"
-# include      <stdio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "trek.h"
+#include "getpar.h"
+
 /*
 **  On-Board Computer
 **
@@ -90,56 +90,56 @@ static char rcsid[] = "$NetBSD: computer.c,v 1.3 1995/04/22 10:58:39 cgd Exp $";
 **     command processor.
 */
 
-struct cvntab  Cputab[] =
-{
-       "ch",                   "art",                  (int (*)())1,           0,
-       "t",                    "rajectory",            (int (*)())2,           0,
-       "c",                    "ourse",                (int (*)())3,           0,
-       "m",                    "ove",                  (int (*)())3,           1,
-       "s",                    "core",                 (int (*)())4,           0,
-       "p",                    "heff",                 (int (*)())5,           0,
-       "w",                    "arpcost",              (int (*)())6,           0,
-       "i",                    "mpcost",               (int (*)())7,           0,
-       "d",                    "istresslist",          (int (*)())8,           0,
-       0
+static struct cvntab Cputab[] = {
+       { "ch",         "art",                  (cmdfun)1,              0 },
+       { "t",          "rajectory",            (cmdfun)2,              0 },
+       { "c",          "ourse",                (cmdfun)3,              0 },
+       { "m",          "ove",                  (cmdfun)3,              1 },
+       { "s",          "core",                 (cmdfun)4,              0 },
+       { "p",          "heff",                 (cmdfun)5,              0 },
+       { "w",          "arpcost",              (cmdfun)6,              0 },
+       { "i",          "mpcost",               (cmdfun)7,              0 },
+       { "d",          "istresslist",          (cmdfun)8,              0 },
+       { NULL,         NULL,                   NULL,                   0 }
 };
 
-computer()
+static int kalc(int, int, int, int, double *);
+static void prkalc(int, double);
+
+/*ARGSUSED*/
+void
+computer(int v __unused)
 {
-       int                     ix, iy;
-       register int            i, j;
-       int                     numout;
-       int                     tqx, tqy;
-       struct cvntab           *r;
-       int                     cost;
-       int                     course;
-       double                  dist, time;
-       double                  warpfact;
-       struct quad             *q;
-       register struct event   *e;
+       int             ix, iy;
+       int             i, j;
+       int             tqx, tqy;
+       const struct cvntab     *r;
+       int             cost;
+       int             course;
+       double          dist, time;
+       double          warpfact;
+       struct quad     *q;
+       struct event    *e;
 
        if (check_out(COMPUTER))
                return;
-       while (1)
-       {
+       while (1) {
                r = getcodpar("\nRequest", Cputab);
-               switch ((int)r->value)
-               {
+               switch ((long)r->value) {
 
                  case 1:                       /* star chart */
-                       printf("Computer record of galaxy for all long range sensor scans\n\n");
+                       printf("Computer record of galaxy for all long range "
+                              "sensor scans\n\n");
                        printf("  ");
                        /* print top header */
                        for (i = 0; i < NQUADS; i++)
                                printf("-%d- ", i);
                        printf("\n");
-                       for (i = 0; i < NQUADS; i++)
-                       {
+                       for (i = 0; i < NQUADS; i++) {
                                printf("%d ", i);
-                               for (j = 0; j < NQUADS; j++)
-                               {
-                                       if (i == Ship.quadx && j == Ship.quady)
-                                       {
+                               for (j = 0; j < NQUADS; j++) {
+                                       if (i == Ship.quadx &&
+                                           j == Ship.quady) {
                                                printf("$$$ ");
                                                continue;
                                        }
@@ -154,7 +154,8 @@ computer()
                                                if (q->scanned < 0)
                                                        printf("... ");
                                                else
-                                                       printf("%3d ", q->scanned);
+                                                       printf("%3d ",
+                                                               q->scanned);
                                }
                                printf("%d\n", i);
                        }
@@ -166,32 +167,29 @@ computer()
                        break;
 
                  case 2:                       /* trajectory */
-                       if (check_out(SRSCAN))
-                       {
+                       if (check_out(SRSCAN)) {
                                break;
                        }
-                       if (Etc.nkling <= 0)
-                       {
+                       if (Etc.nkling <= 0) {
                                printf("No Klingons in this quadrant\n");
                                break;
                        }
                        /* for each Klingon, give the course & distance */
-                       for (i = 0; i < Etc.nkling; i++)
-                       {
-                               printf("Klingon at %d,%d", Etc.klingon[i].x, Etc.klingon[i].y);
-                               course = kalc(Ship.quadx, Ship.quady, Etc.klingon[i].x, Etc.klingon[i].y, &dist);
+                       for (i = 0; i < Etc.nkling; i++) {
+                               printf("Klingon at %d,%d",
+                                       Etc.klingon[i].x, Etc.klingon[i].y);
+                               course = kalc(Ship.quadx, Ship.quady,
+                                             Etc.klingon[i].x,
+                                             Etc.klingon[i].y, &dist);
                                prkalc(course, dist);
                        }
                        break;
 
                  case 3:                       /* course calculation */
-                       if (readdelim('/'))
-                       {
+                       if (readdelim('/')) {
                                tqx = Ship.quadx;
                                tqy = Ship.quady;
-                       }
-                       else
-                       {
+                       } else {
                                ix = getintpar("Quadrant");
                                if (ix < 0 || ix >= NSECTS)
                                        break;
@@ -208,13 +206,13 @@ computer()
                        if (iy < 0 || iy >= NSECTS)
                                break;
                        course = kalc(tqx, tqy, ix, iy, &dist);
-                       if (r->value2)
-                       {
+                       if (r->value2) {
                                warp(-1, course, dist);
                                break;
                        }
                        printf("%d,%d/%d,%d to %d,%d/%d,%d",
-                               Ship.quadx, Ship.quady, Ship.sectx, Ship.secty, tqx, tqy, ix, iy);
+                               Ship.quadx, Ship.quady, Ship.sectx, Ship.secty,
+                               tqx, tqy, ix, iy);
                        prkalc(course, dist);
                        break;
 
@@ -228,7 +226,8 @@ computer()
                                break;
                        dist *= 10.0;
                        cost = pow(0.90, dist) * 98.0 + 0.5;
-                       printf("Phasers are %d%% effective at that range\n", cost);
+                       printf("Phasers are %d%% effective at that range\n",
+                               cost);
                        break;
 
                  case 6:                       /* warp cost (time/energy) */
@@ -240,7 +239,8 @@ computer()
                                warpfact = Ship.warp;
                        cost = (dist + 0.05) * warpfact * warpfact * warpfact;
                        time = Param.warptime * dist / (warpfact * warpfact);
-                       printf("Warp %.2f distance %.2f cost %.2f stardates %d (%d w/ shlds up) units\n",
+                       printf("Warp %.2f distance %.2f cost %.2f "
+                              "stardates %d (%d w/ shlds up) units\n",
                                warpfact, dist, time, cost, cost + cost);
                        break;
 
@@ -258,25 +258,26 @@ computer()
                        j = 1;
                        printf("\n");
                        /* scan the event list */
-                       for (i = 0; i < MAXEVENTS; i++)
-                       {
+                       for (i = 0; i < MAXEVENTS; i++) {
                                e = &Event[i];
                                /* ignore hidden entries */
                                if (e->evcode & E_HIDDEN)
                                        continue;
-                               switch (e->evcode & E_EVENT)
-                               {
+                               switch (e->evcode & E_EVENT) {
 
                                  case E_KDESB:
-                                       printf("Klingon is attacking starbase in quadrant %d,%d\n",
+                                       printf("Klingon is attacking starbase "
+                                              "in quadrant %d,%d\n",
                                                e->x, e->y);
                                        j = 0;
                                        break;
 
                                  case E_ENSLV:
                                  case E_REPRO:
-                                       printf("Starsystem %s in quadrant %d,%d is distressed\n",
-                                               Systemname[e->systemname], e->x, e->y);
+                                       printf("Starsystem %s in quadrant "
+                                              "%d,%d is distressed\n",
+                                               Systemname[e->systemname],
+                                               e->x, e->y);
                                        j = 0;
                                        break;
                                }
@@ -287,15 +288,15 @@ computer()
 
                }
 
-               /* skip to next semicolon or newline.  Semicolon
+               /*
+                * Skip to next semicolon or newline.  Semicolon
                 * means get new computer request; newline means
-                * exit computer mode. */
-               while ((i = cgetc(0)) != ';')
-               {
-                       if (i == '\0')
+                * exit computer mode.
+                */
+               while ((i = getchar()) != ';') {
+                       if (i == EOF)
                                exit(1);
-                       if (i == '\n')
-                       {
+                       if (i == '\n') {
                                ungetc(i, stdin);
                                return;
                        }
@@ -311,17 +312,13 @@ computer()
 **     sqx,sqy/ssx,ssy to tqx,tqy/tsx,tsy.
 */
 
-kalc(tqx, tqy, tsx, tsy, dist)
-int    tqx;
-int    tqy;
-int    tsx;
-int    tsy;
-double *dist;
+static int
+kalc(int tqx, int tqy, int tsx, int tsy, double *dist)
 {
        double                  dx, dy;
        double                  quadsize;
        double                  angle;
-       register int            course;
+       int             course;
 
        /* normalize to quadrant distances */
        quadsize = NSECTS;
@@ -340,10 +337,8 @@ double     *dist;
        return (course);
 }
 
-
-prkalc(course, dist)
-int    course;
-double dist;
+static void
+prkalc(int course, double dist)
 {
        printf(": course %d  dist %.3f\n", course, dist);
 }