cgram: place the 'solved' marker nearer to the text

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

diff --git a/trek/dumpme.c b/trek/dumpme.c
index cbbe896a131a78bc39df22c6f2ebce629411d265..ce53d5d62032abeda6a32eb88f702569f88319fc 100644 (file)
--- a/trek/dumpme.c
+++ b/trek/dumpme.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dumpme.c,v 1.8 2009/05/24 22:55:03 dholland 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,12 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dumpme.c   5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dumpme.c,v 1.2 1993/08/01 18:50:37 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dumpme.c   8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: dumpme.c,v 1.8 2009/05/24 22:55:03 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
 
 /*
 **  Dump the starship somewhere in the galaxy
@@ -50,33 +53,31 @@ static char rcsid[] = "$Id: dumpme.c,v 1.2 1993/08/01 18:50:37 mycroft Exp $";
 **     Repair of devices must be deferred.
 */
 
-dumpme(flag)
-int    flag;
+void
+dumpme(int flag)
 {
-       register int            f;
-       double                  x;
-       register struct event   *e;
-       register int            i;
+       int             f;
+       double          x;
+       struct event    *e;
+       int             i;
 
        f = flag;
        Ship.quadx = ranf(NQUADS);
        Ship.quady = ranf(NQUADS);
        Ship.sectx = ranf(NSECTS);
        Ship.secty = ranf(NSECTS);
-       x += 1.5 * franf();
+       x = 1.5 * franf();
        Move.time += x;
-       if (f)
-       {
+       if (f) {
                printf("%s falls into a black hole.\n", Ship.shipname);
-       }
-       else
-       {
-               printf("Computer applies full reverse power to avoid hitting the\n");
-               printf("   negative energy barrier.  A space warp was entered.\n");
+       } else {
+               printf("Computer applies full reverse power to avoid hitting "
+                      "the\n");
+               printf("   negative energy barrier.  A space warp was "
+                      "entered.\n");
        }
        /* bump repair dates forward */
-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {
                e = &Event[i];
                if (e->evcode != E_FIXDV)
                        continue;