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 627216f79832398925184844924d10b336105230..8364e514b4a47f662bbe764c7fc7052c8b84ff22 100644 (file)
--- a/rogue/object.c
+++ b/rogue/object.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: object.c,v 1.5 1997/10/15 09:27:06 is 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.5 1997/10/15 09:27:06 is Exp $");
+__RCSID("$NetBSD: object.c,v 1.9 2003/08/07 09:37:39 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -239,6 +235,7 @@ plant_gold(row, col, is_maze)
 void
 place_at(obj, row, col)
        object *obj;
+       int row, col;
 {
        obj->row = row;
        obj->col = col;
@@ -268,6 +265,7 @@ object_at(pack, row, col)
 
 object *
 get_letter_object(ch)
+       int ch;
 {
        object *obj;
 
@@ -293,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:
@@ -504,8 +502,6 @@ gr_weapon(obj, assign_wk)
        short i;
        short blessing, increment;
 
-       increment = 0; /* XXX make gcc happy */
-
        obj->what_is = WEAPON;
        if (assign_wk) {
                obj->which_kind = get_rand(0, (WEAPONS - 1));
@@ -522,13 +518,13 @@ gr_weapon(obj, assign_wk)
        percent = get_rand(1, 96);
        blessing = get_rand(1, 3);
 
-       if (percent <= 16) {
-               increment = 1;
-       } else if (percent <= 32) {
-               increment = -1;
-               obj->is_cursed = 1;
-       }
        if (percent <= 32) {
+               if (percent <= 16) {
+                       increment = 1;
+               } else {
+                       increment = -1;
+                       obj->is_cursed = 1;
+               }
                for (i = 0; i < blessing; i++) {
                        if (coin_toss()) {
                                obj->hit_enchant += increment;
@@ -624,7 +620,7 @@ put_stairs()
 
 int
 get_armor_class(obj)
-       object *obj;
+       const object *obj;
 {
        if (obj) {
                return(obj->class + obj->d_enchant);