cgram: conform to lint's strict bool mode, KNF

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

diff --git a/trek/impulse.c b/trek/impulse.c
index f1ef4daa136f0748f446ee05891122fd43c39e60..49358bd2e782f29c8c9c927d7e5353c74e1e660a 100644 (file)
--- a/trek/impulse.c
+++ b/trek/impulse.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: impulse.c,v 1.10 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,36 +29,47 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)impulse.c  5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: impulse.c,v 1.2 1993/08/01 18:50:27 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)impulse.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: impulse.c,v 1.10 2009/05/24 22:55:03 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
+#include "getpar.h"
 
 /**
  **    move under impulse power
  **/
 
-impulse()
+/*ARGSUSED*/
+void
+impulse(int v __unused)
 {
-       int                     course;
-       register int            power;
-       double                  dist, time;
-       register int            percent;
-       extern double           move();
+       int             course;
+       int             power;
+       double          dist, time;
+       int             percent;
 
-       if (Ship.cond == DOCKED)
-               return (printf("Scotty: Sorry captain, but we are still docked.\n"));
-       if (damaged(IMPULSE))
-               return (out(IMPULSE));
+       if (Ship.cond == DOCKED) {
+               printf("Scotty: Sorry captain, but we are still docked.\n");
+               return;
+       }
+       if (damaged(IMPULSE)) {
+               out(IMPULSE);
+               return;
+       }
        if (getcodi(&course, &dist))
                return;
        power = 20 + 100 * dist;
        percent = 100 * power / Ship.energy + 0.5;
-       if (percent >= 85)
-       {
-               printf("Scotty: That would consume %d%% of our remaining energy.\n",
+       if (percent >= 85) {
+               printf("Scotty: That would consume %d%% of our remaining "
+                      "energy.\n",
                        percent);
                if (!getynpar("Are you sure that is wise"))
                        return;
@@ -68,8 +77,7 @@ impulse()
        }
        time = dist / 0.095;
        percent = 100 * time / Now.time + 0.5;
-       if (percent >= 85)
-       {
+       if (percent >= 85) {
                printf("Spock: That would take %d%% of our remaining time.\n",
                        percent);
                if (!getynpar("Are you sure that is wise"))