random(6): Use arc4random_uniform to simplify code

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

diff --git a/trek/checkcond.c b/trek/checkcond.c
index e490c9bfab7ee3f73a1ac13314e9f4c4b74bdb6c..a6251099ded0093a8334db70175e2f4167474e2b 100644 (file)
--- a/trek/checkcond.c
+++ b/trek/checkcond.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: checkcond.c,v 1.7 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,11 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)checkcond.c        5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)checkcond.c        8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: checkcond.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include "trek.h"
 
 /*
 **  Check for Condition After a Move
@@ -62,10 +65,9 @@ static char sccsid[] = "@(#)checkcond.c      5.4 (Berkeley) 6/1/90";
 **     and battle conditions.
 */
 
-checkcond()
+void
+checkcond(void)
 {
-       register int            i, j;
-
        /* see if we are still alive and well */
        if (Ship.reserves < 0.0)
                lose(L_NOLIFE);
@@ -89,13 +91,11 @@ checkcond()
        if (Ship.cond == DOCKED)
                return;
 
-       if (Etc.nkling > 0)
-       {
+       if (Etc.nkling > 0) {
                Ship.cond = RED;
                return;
        }
-       if (Ship.energy < Param.energylow)
-       {
+       if (Ship.energy < Param.energylow) {
                Ship.cond = YELLOW;
                return;
        }