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

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

diff --git a/rogue/object.c b/rogue/object.c
index 874af97a1da2020e0bcc4d5e73f6304a9efefc46..8364e514b4a47f662bbe764c7fc7052c8b84ff22 100644 (file)
--- a/rogue/object.c
+++ b/rogue/object.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: object.c,v 1.7 1998/09/11 14:09:27 hubertf Exp $       */
+/*     $NetBSD: object.c,v 1.9 2003/08/07 09:37:39 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[] = "@(#)object.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: object.c,v 1.7 1998/09/11 14:09:27 hubertf Exp $");
+__RCSID("$NetBSD: object.c,v 1.9 2003/08/07 09:37:39 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -295,11 +291,11 @@ free_stuff(objlist)
        }
 }
 
-char *
+const char *
 name_of(obj)
-       object *obj;
+       const object *obj;
 {
-       char *retstring;
+       const char *retstring;
 
        switch(obj->what_is) {
        case SCROL:
@@ -624,7 +620,7 @@ put_stairs()
 
 int
 get_armor_class(obj)
-       object *obj;
+       const object *obj;
 {
        if (obj) {
                return(obj->class + obj->d_enchant);