off-by-one. aaron@openbsd

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

diff --git a/trek/klmove.c b/trek/klmove.c
index ca9ba1ce1e43cb0fa5acec225b2a271b19ff46a7..0ab26fec64e06c815ee27f62ba047157cd39e709 100644 (file)
--- a/trek/klmove.c
+++ b/trek/klmove.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 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,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)klmove.c   5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)klmove.c   8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
 
 /*
 **  Move Klingons Around
@@ -60,14 +64,15 @@ static char sccsid[] = "@(#)klmove.c        5.4 (Berkeley) 6/1/90";
 **     course around stars.
 */
 
+void
 klmove(fl)
 int    fl;
 {
        int                     n;
-       register struct kling   *k;
+       struct kling    *k;
        double                  dx, dy;
        int                     nextx, nexty;
-       register int            lookx, looky;
+       int             lookx, looky;
        int                     motion;
        int                     fudgex, fudgey;
        int                     qx, qy;
@@ -78,7 +83,7 @@ int   fl;
        if (Trace)
                printf("klmove: fl = %d, Etc.nkling = %d\n", fl, Etc.nkling);
 #      endif
-       for (n = 0; n < Etc.nkling; k && n++)
+       for (n = 0; n < Etc.nkling; n++)
        {
                k = &Etc.klingon[n];
                i = 100;
@@ -145,7 +150,7 @@ int fl;
                                Sect[k->x][k->y] = EMPTY;
                                Quad[qx][qy].klings += 1;
                                Etc.nkling -= 1;
-                               bmove(&Etc.klingon[Etc.nkling], k, sizeof *k);
+                               *k = Etc.klingon[Etc.nkling];
                                Quad[Ship.quadx][Ship.quady].klings -= 1;
                                k = 0;
                                break;