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 68284d9decf9b84bf6fdb58989e7d13fcef6a11c..9ef133bca42cea68761dd43dcf723bfbd56351a7 100644 (file)
--- a/rogue/trap.c
+++ b/rogue/trap.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.4 1997/10/12 11:46:09 lukem 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.
  *
@@ -41,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)trap.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: trap.c,v 1.4 1997/10/12 11:46:09 lukem Exp $");
+__RCSID("$NetBSD: trap.c,v 1.6 2003/08/07 09:37:40 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,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",