Fix macro order, and quote question mark.

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

diff --git a/trek/events.c b/trek/events.c
index 4ed6d982b64de1df6b58f5a926ccd2daa761674e..a49472779419f6a89ee130b8fa6107813385391f 100644 (file)
--- a/trek/events.c
+++ b/trek/events.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: events.c,v 1.6 2001/06/12 15:17:12 wiz 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
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,11 +33,20 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)events.c   5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)events.c   8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: events.c,v 1.6 2001/06/12 15:17:12 wiz Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include      "trek.h"
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include "getpar.h"
+#include "trek.h"

 
 /*
 **  CAUSE TIME TO ELAPSE
 
 /*
 **  CAUSE TIME TO ELAPSE


@@ -46,19 +57,21 @@ static char sccsid[] = "@(#)events.c        5.4 (Berkeley) 6/1/90";
 */
 
 
 */
 
 

+int

 events(warp)
 int    warp;           /* set if called in a time warp */
 {
 events(warp)
 int    warp;           /* set if called in a time warp */
 {

-       register int            i;
-       int                     j;
+       int             i;
+       char                    *p;
+       int                     j = 0;

        struct kling            *k;
        double                  rtime;
        double                  xdate;
        double                  idate;
        struct kling            *k;
        double                  rtime;
        double                  xdate;
        double                  idate;

-       struct event            *ev, *xsched(), *schedule();
+       struct event            *ev = NULL;

        int                     ix, iy;
        int                     ix, iy;

-       register struct quad    *q;
-       register struct event   *e;
+       struct quad     *q;
+       struct event    *e;

        int                     evnum;
        int                     restcancel;
 
        int                     evnum;
        int                     restcancel;
 


@@ -132,7 +145,7 @@ int warp;           /* set if called in a time warp */
 
                  case E_SNOVA:                 /* supernova */
                        /* cause the supernova to happen */
 
                  case E_SNOVA:                 /* supernova */
                        /* cause the supernova to happen */

-                       snova(-1);
+                       snova(-1, 0);

                        /* and schedule the next one */
                        xresched(e, E_SNOVA, 1);
                        break;
                        /* and schedule the next one */
                        xresched(e, E_SNOVA, 1);
                        break;


@@ -222,7 +235,7 @@ int warp;           /* set if called in a time warp */
                        /* report it if we can */
                        if (!damaged(SSRADIO))
                        {
                        /* report it if we can */
                        if (!damaged(SSRADIO))
                        {

-                               printf("\nUhura:  Captain, we have recieved a distress signal\n");
+                               printf("\nUhura:  Captain, we have received a distress signal\n");

                                printf("  from the starbase in quadrant %d,%d.\n",
                                        ix, iy);
                                restcancel++;
                                printf("  from the starbase in quadrant %d,%d.\n",
                                        ix, iy);
                                restcancel++;


@@ -383,10 +396,12 @@ int       warp;           /* set if called in a time warp */
 
                  case E_SNAP:          /* take a snapshot of the galaxy */
                        xresched(e, E_SNAP, 1);
 
                  case E_SNAP:          /* take a snapshot of the galaxy */
                        xresched(e, E_SNAP, 1);

-                       i = (int) Etc.snapshot;
-                       i = bmove(Quad, i, sizeof (Quad));
-                       i = bmove(Event, i, sizeof (Event));
-                       i = bmove(&Now, i, 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));

                        Game.snap = 1;
                        break;
 
                        Game.snap = 1;
                        break;
 


@@ -441,7 +456,7 @@ int warp;           /* set if called in a time warp */
        }
 
        /* unschedule an attack during a rest period */
        }
 
        /* unschedule an attack during a rest period */

-       if (e = Now.eventptr[E_ATTACK])
+       if ((e = Now.eventptr[E_ATTACK]) != NULL)

                unschedule(e);
 
        if (!warp)
                unschedule(e);
 
        if (!warp)