Fix merge conflicts

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

diff --git a/trek/ram.c b/trek/ram.c
index a31780250eb7066c82e0d2e3ed471e4e2b60d01a..ee6b67d3d0a4a02569d2a5f7f7a80dba2073bce5 100644 (file)
--- a/trek/ram.c
+++ b/trek/ram.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: ram.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,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)ram.c      5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: ram.c,v 1.2 1993/08/01 18:50:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)ram.c      8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: ram.c,v 1.8 2009/05/24 22:55:03 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <unistd.h>
+#include "trek.h"
 
 /*
 **  RAM SOME OBJECT
@@ -49,16 +53,15 @@ static char rcsid[] = "$Id: ram.c,v 1.2 1993/08/01 18:50:07 mycroft Exp $";
 **     also rack up incredible damages.
 */
 
-ram(ix, iy)
-int    ix, iy;
+void
+ram(int ix, int iy)
 {
-       register int            i;
-       register char           c;
+       int             i;
+       char            c;
 
        printf("\07RED ALERT\07: collision imminent\n");
        c = Sect[ix][iy];
-       switch (c)
-       {
+       switch (c) {
 
          case KLINGON:
                printf("%s rams Klingon at %d,%d\n", Ship.shipname, ix, iy);
@@ -69,7 +72,8 @@ int   ix, iy;
          case INHABIT:
                printf("Yeoman Rand: Captain, isn't it getting hot in here?\n");
                sleep(2);
-               printf("Spock: Hull temperature approaching 550 Degrees Kelvin.\n");
+               printf("Spock: Hull temperature approaching 550 Degrees "
+                      "Kelvin.\n");
                lose(L_STAR);
 
          case BASE:
@@ -90,8 +94,7 @@ int   ix, iy;
        printf("McCoy: Take it easy Jim; we had %d casualties.\n", i);
 
        /* damage devices with an 80% probability */
-       for (i = 0; i < NDEV; i++)
-       {
+       for (i = 0; i < NDEV; i++) {
                if (ranf(100) < 20)
                        continue;
                damage(i, (2.5 * (franf() + franf()) + 1.0) * Param.damfac[i]);