Move UCB-licensed code from 4-clause to 3-clause licence.

[bsdgames-darwin.git] / rogue / trap.c

diff --git a/rogue/trap.c b/rogue/trap.c
index 55b23ffb20168e6d331b04dc4e2da74589a136de..9ef133bca42cea68761dd43dcf723bfbd56351a7 100644 (file)
--- a/rogue/trap.c
+++ b/rogue/trap.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: trap.c,v 1.6 2003/08/07 09:37:40 agc Exp $     */
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -13,11 +15,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.
  *
@@ -34,9 +32,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)trap.c     5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: trap.c,v 1.2 1993/08/01 18:52:09 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)trap.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: trap.c,v 1.6 2003/08/07 09:37:40 agc Exp $");
+#endif
 #endif /* not lint */
 
 /*
@@ -57,7 +59,7 @@ trap traps[MAX_TRAPS];
 boolean trap_door = 0;
 short bear_trap = 0;
 
-char *trap_strings[TRAPS * 2] = {
+const char *const trap_strings[TRAPS * 2] = {
        "trap door",
                        "you fell down a trap",
        "bear trap",
@@ -72,15 +74,9 @@ char *trap_strings[TRAPS * 2] = {
                        "a gush of water hits you on the head"
 };
 
-extern short cur_level, party_room;
-extern char *new_level_message;
-extern boolean interrupted;
-extern short ring_exp;
-extern boolean sustain_strength;
-extern short blind;
-
+short
 trap_at(row, col)
-register row, col;
+       int row, col;
 {
        short i;
 
@@ -92,8 +88,9 @@ register row, col;
        return(NO_TRAP);
 }
 
+void
 trap_player(row, col)
-short row, col;
+       short row, col;
 {
        short t;
 
@@ -144,6 +141,7 @@ short row, col;
        }
 }
 
+void
 add_traps()
 {
        short i, n, tries = 0;
@@ -188,6 +186,7 @@ add_traps()
        }
 }
 
+void
 id_trap()
 {
        short dir, row, col, d, t;
@@ -215,6 +214,7 @@ id_trap()
        }
 }
 
+void
 show_traps()
 {
        short i, j;
@@ -228,9 +228,10 @@ show_traps()
        }
 }
 
+void
 search(n, is_auto)
-short n;
-boolean is_auto;
+       short n;
+       boolean is_auto;
 {
        short s, i, j, row, col, t;
        short shown = 0, found = 0;