speed limit 80

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

diff --git a/trek/move.c b/trek/move.c
index 2b772821d9fe06ff15ff965279f70e30d0e29d10..cec5dfcafa584a47a4b9c9e5211b91e39a06ed0d 100644 (file)
--- a/trek/move.c
+++ b/trek/move.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $        */
+/*     $NetBSD: move.c,v 1.11 2011/07/03 06:44:01 mrg Exp $    */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,12 +34,13 @@
 #if 0
 static char sccsid[] = "@(#)move.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.11 2011/07/03 06:44:01 mrg Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <math.h>
+#include <float.h>
 #include "trek.h"
 
 /*
@@ -118,18 +119,17 @@ move(int ramflag, int course, double time, double speed)
        evtime = Now.eventptr[E_LRTB]->date - Now.date;
 #ifdef xTRACE
        if (Trace)
-               printf("E.ep = %p, ->evcode = %d, ->date = %.2f, evtime = %.2f\n",
+               printf("E.ep = %p, ->evcode = %d, ->date = %.2f, "
+                      "evtime = %.2f\n",
                        Now.eventptr[E_LRTB], Now.eventptr[E_LRTB]->evcode,
                        Now.eventptr[E_LRTB]->date, evtime);
 #endif
-       if (time > evtime && Etc.nkling < 3)
-       {
+       if (time > evtime && Etc.nkling < 3) {
                /* then we got a LRTB */
                evtime += 0.005;
                time = evtime;
-       }
-       else
-               evtime = -1.0e50;
+       } else
+               evtime = DBL_MIN;
        dist = time * speed;
 
        /* move within quadrant */
@@ -140,20 +140,20 @@ move(int ramflag, int course, double time, double speed)
        n = xn + 0.5;
 #ifdef xTRACE
        if (Trace)
-               printf("dx = %.2f, dy = %.2f, xn = %.2f, n = %d\n", dx, dy, xn, n);
+               printf("dx = %.2f, dy = %.2f, xn = %.2f, n = %d\n",
+                       dx, dy, xn, n);
 #endif
        Move.free = 0;
 
-       for (i = 0; i < n; i++)
-       {
+       for (i = 0; i < n; i++) {
                ix = (x += dx);
                iy = (y += dy);
 #ifdef xTRACE
                if (Trace)
-                       printf("ix = %d, x = %.2f, iy = %d, y = %.2f\n", ix, x, iy, y);
+                       printf("ix = %d, x = %.2f, iy = %d, y = %.2f\n",
+                               ix, x, iy, y);
 #endif
-               if (x < 0.0 || y < 0.0 || x >= sectsize || y >= sectsize)
-               {
+               if (x < 0.0 || y < 0.0 || x >= sectsize || y >= sectsize) {
                        /* enter new quadrant */
                        dx = Ship.quadx * NSECTS + Ship.sectx + dx * xn;
                        dy = Ship.quady * NSECTS + Ship.secty + dy * xn;
@@ -190,21 +190,19 @@ move(int ramflag, int course, double time, double speed)
                        n = 0;
                        break;
                }
-               if (Sect[ix][iy] != EMPTY)
-               {
+               if (Sect[ix][iy] != EMPTY) {
                        /* we just hit something */
-                       if (!damaged(COMPUTER) && ramflag <= 0)
-                       {
+                       if (!damaged(COMPUTER) && ramflag <= 0) {
                                ix = x - dx;
                                iy = y - dy;
-                               printf("Computer reports navigation error; %s stopped at %d,%d\n",
+                               printf("Computer reports navigation error; "
+                                      "%s stopped at %d,%d\n",
                                        Ship.shipname, ix, iy);
                                Ship.energy -= Param.stopengy * speed;
                                break;
                        }
                        /* test for a black hole */
-                       if (Sect[ix][iy] == HOLE)
-                       {
+                       if (Sect[ix][iy] == HOLE) {
                                /* get dumped elsewhere in the galaxy */
                                dumpme(1);
                                initquad(0);
@@ -215,14 +213,15 @@ move(int ramflag, int course, double time, double speed)
                        break;
                }
        }
-       if (n > 0)
-       {
+       if (n > 0) {
                dx = Ship.sectx - ix;
                dy = Ship.secty - iy;
                dist = sqrt(dx * dx + dy * dy) / NSECTS;
                time = dist / speed;
-               if (evtime > time)
-                       time = evtime;          /* spring the LRTB trap */
+               if (evtime > time) {
+                       /* spring the LRTB trap */
+                       time = evtime;
+               }
                Ship.sectx = ix;
                Ship.secty = iy;
        }