buffnum is shared between subs.c and fancy.c

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

diff --git a/trek/damage.c b/trek/damage.c
index b99ebcf956f92987aaaed9494a8d15fa54769a2b..73dfbee987d3d2b01a66fd6c34bdc814232bea23 100644 (file)
--- a/trek/damage.c
+++ b/trek/damage.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 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,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)damage.c   5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: damage.c,v 1.2 1993/08/01 18:50:44 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)damage.c   8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <err.h>
+#include "trek.h"
 
 /*
 **  Schedule Ship.damages to a Device
@@ -48,16 +52,18 @@ static char rcsid[] = "$Id: damage.c,v 1.2 1993/08/01 18:50:44 mycroft Exp $";
 **
 **     Note that the repair of the device occurs on a DATE, meaning
 **     that the dock() and undock() have to reschedule the event.
+**
+**  dev1 -- device index
+**  dam -- time to repair
 */
 
-damage(dev1, dam)
-int    dev1;           /*  device index */
-double dam;            /* time to repair */
+void
+damage(int dev1, double dam)
 {
-       register int            i;
-       register struct event   *e;
-       int                     f;
-       register int            dev;
+       int             i;
+       struct event    *e;
+       int             f;
+       int             dev;
 
        /* ignore zero damages */
        if (dam <= 0.0)
@@ -71,16 +77,14 @@ double      dam;            /* time to repair */
                dam *= Param.dockfac;
        /* set the damage flag */
        f = damaged(dev);
-       if (!f)
-       {
+       if (!f) {
                /* new damages -- schedule a fix */
                schedule(E_FIXDV, dam, 0, 0, dev);
                return;
        }
        /* device already damaged -- add to existing damages */
        /* scan for old damages */
-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {
                e = &Event[i];
                if (e->evcode != E_FIXDV || e->systemname != dev)
                        continue;
@@ -88,5 +92,5 @@ double        dam;            /* time to repair */
                reschedule(e, e->date - Now.date + dam);
                return;
        }
-       syserr("Cannot find old damages %d\n", dev);
+       errx(1, "Cannot find old damages %d", dev);
 }