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 bd2aff3723f96e427e4b0ab1393c2baed15556d4..9ef133bca42cea68761dd43dcf723bfbd56351a7 100644 (file)
--- a/rogue/trap.c
+++ b/rogue/trap.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.3 1995/04/22 10:28:35 cgd Exp $     */
+/*     $NetBSD: trap.c,v 1.6 2003/08/07 09:37:40 agc Exp $     */
 
 /*
  * Copyright (c) 1988, 1993
@@ -15,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.
  *
@@ -36,11 +32,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)trap.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: trap.c,v 1.3 1995/04/22 10:28:35 cgd Exp $";
+__RCSID("$NetBSD: trap.c,v 1.6 2003/08/07 09:37:40 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,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",
@@ -77,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;
 
@@ -97,8 +88,9 @@ register row, col;
        return(NO_TRAP);
 }
 
+void
 trap_player(row, col)
-short row, col;
+       short row, col;
 {
        short t;
 
@@ -149,6 +141,7 @@ short row, col;
        }
 }
 
+void
 add_traps()
 {
        short i, n, tries = 0;
@@ -193,6 +186,7 @@ add_traps()
        }
 }
 
+void
 id_trap()
 {
        short dir, row, col, d, t;
@@ -220,6 +214,7 @@ id_trap()
        }
 }
 
+void
 show_traps()
 {
        short i, j;
@@ -233,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;