Hobbes was misspelled. PR#23301

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

diff --git a/trek/warp.c b/trek/warp.c
index 2fc4852a9050bf56d25cc67a92381f25441a45b9..c82aa1b22c8e2c8a88885ca5003bac4514ea2407 100644 (file)
--- a/trek/warp.c
+++ b/trek/warp.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $     */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 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.
  *
@@ -31,11 +29,21 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)warp.c     5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)warp.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <unistd.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  MOVE UNDER WARP POWER
@@ -53,34 +61,45 @@ static char sccsid[] = "@(#)warp.c  5.4 (Berkeley) 6/1/90";
 **     case, there is code to handle time warps, etc.
 */
 
+void
+dowarp(fl)
+       int fl;
+{
+       int c;
+       double d;
+
+       if (getcodi(&c, &d))
+               return;
+       warp(fl, c, d);
+}
+
+void
 warp(fl, c, d)
 int    fl, c;
 double d;
 {
-       int                     course;
-       double                  power;
-       double                  dist;
-       double                  time;
-       double                  speed;
-       double                  frac;
-       register int            percent;
-       register int            i;
-       extern double           move();
-
-       if (Ship.cond == DOCKED)
-               return (printf("%s is docked\n", Ship.shipname));
-       if (damaged(WARP))
-       {
-               return (out(WARP));
+       char           *p;
+       int             course;
+       double          power;
+       double          dist;
+       double          time;
+       double          speed;
+       double          frac;
+       int             percent;
+       int             i;
+
+       if (Ship.cond == DOCKED) {
+               printf("%s is docked\n", Ship.shipname);
+               return;
        }
-       if (fl < 0)
+       if (damaged(WARP))
        {
-               course = c;
-               dist = d;
+               out(WARP);
+               return;
        }
-       else
-               if (getcodi(&course, &dist))
-                       return;
+
+       course = c;
+       dist = d;
 
        /* check to see that we are not using an absurd amount of power */
        power = (dist + 0.05) * Ship.warp3;
@@ -134,7 +153,8 @@ double      d;
        sleep(4);
        if (ranf(100) >= 100 * dist)
        {
-               return (printf("Equilibrium restored -- all systems normal\n"));
+               printf("Equilibrium restored -- all systems normal\n");
+               return;
        }
 
        /* select a bizzare thing to happen to us */
@@ -160,10 +180,12 @@ double    d;
 
                /* s/he got lucky: a negative time portal */
                time = Now.date;
-               i = (int) Etc.snapshot;
-               bmove(i, Quad, sizeof Quad);
-               bmove(i += sizeof Quad, Event, sizeof Event);
-               bmove(i += sizeof Event, &Now, sizeof Now);
+               p = (char *) Etc.snapshot;
+               memcpy(p, Quad, sizeof Quad);
+               p += sizeof Quad;
+               memcpy(p, Event, sizeof Event);
+               p += sizeof Event;
+               memcpy(p, &Now, sizeof Now);
                printf("Negative time portal entered -- it is now Stardate %.2f\n",
                        Now.date);
                for (i = 0; i < MAXEVENTS; i++)
@@ -175,7 +197,7 @@ double      d;
        /* test for just a lot of damage */
        if (percent < 80)
                lose(L_TOOFAST);
-       printf("Equilibrium restored -- extreme damage occured to ship systems\n");
+       printf("Equilibrium restored -- extreme damage occurred to ship systems\n");
        for (i = 0; i < NDEV; i++)
                damage(i, (3.0 * (franf() + franf()) + 1.0) * Param.damfac[i]);
        Ship.shldup = 0;