Add `__noreturn__' and `__unused__' attributes where appropriate to

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

diff --git a/rogue/monster.c b/rogue/monster.c
index a81fd31163357634db31628291e4d942f4430f11..67bde91d01f0d988f3dbc16bbd5d2c0def266bd2 100644 (file)
--- a/rogue/monster.c
+++ b/rogue/monster.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: monster.c,v 1.7 1998/11/10 13:01:32 hubertf 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.
@@ -34,9 +36,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)monster.c  5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: monster.c,v 1.2 1993/08/01 18:52:23 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)monster.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: monster.c,v 1.7 1998/11/10 13:01:32 hubertf Exp $");
+#endif
 #endif /* not lint */
 
 /*
@@ -56,7 +62,7 @@ static char rcsid[] = "$Id: monster.c,v 1.2 1993/08/01 18:52:23 mycroft Exp $";
 object level_monsters;
 boolean mon_disappeared;
 
-char *m_names[] = {
+const char *const m_names[] = {
        "aquator",
        "bat",
        "centaur",
@@ -118,12 +124,7 @@ object mon_tab[MONSTERS] = {
        {(ASLEEP|WAKENS|WANDERS),"1d7",21,'Z',8,5,14,69,0,0,0,0,0}
 };
 
-extern short cur_level;
-extern short cur_room, party_room;
-extern short blind, halluc, haste_self;
-extern boolean detect_monster, see_invisible, r_see_invisible;
-extern short stealthy;
-
+void
 put_mons()
 {
        short i;
@@ -145,8 +146,8 @@ put_mons()
 
 object *
 gr_monster(monster, mn)
-register object *monster;
-register mn;
+       object *monster;
+       int mn;
 {
        if (!monster) {
                monster = alloc_object();
@@ -170,9 +171,10 @@ register mn;
        return(monster);
 }
 
+void
 mv_mons()
 {
-       register object *monster, *next_monster;
+       object *monster, *next_monster, *test_mons;
        boolean flew;
 
        if (haste_self % 2) {
@@ -211,18 +213,30 @@ mv_mons()
                if (!(flew && mon_can_go(monster, rogue.row, rogue.col))) {
                        mv_1_monster(monster, rogue.row, rogue.col);
                }
-NM:            monster = next_monster;
+NM:            test_mons = level_monsters.next_monster;
+               monster = NULL;
+               while (test_mons)
+               {
+                       if (next_monster == test_mons)
+                       {
+                               monster = next_monster;
+                               break;
+                       }
+                       test_mons = test_mons -> next_monster;
+               }
        }
 }
 
+void
 party_monsters(rn, n)
-int rn, n;
+       int rn, n;
 {
        short i, j;
        short row, col;
        object *monster;
        boolean found;
 
+       row = col = 0;
        n += n;
 
        for (i = 0; i < MONSTERS; i++) {
@@ -255,12 +269,13 @@ int rn, n;
        }
 }
 
+char
 gmc_row_col(row, col)
-register row, col;
+       int row, col;
 {
-       register object *monster;
+       object *monster;
 
-       if (monster = object_at(&level_monsters, row, col)) {
+       if ((monster = object_at(&level_monsters, row, col)) != NULL) {
                if ((!(detect_monster || see_invisible || r_see_invisible) &&
                        (monster->m_flags & INVISIBLE)) || blind) {
                        return(monster->trail_char);
@@ -274,8 +289,9 @@ register row, col;
        }
 }
 
+char
 gmc(monster)
-object *monster;
+       object *monster;
 {
        if ((!(detect_monster || see_invisible || r_see_invisible) &&
                (monster->m_flags & INVISIBLE))
@@ -288,9 +304,10 @@ object *monster;
        return(monster->m_char);
 }
 
+void
 mv_1_monster(monster, row, col)
-register object *monster;
-short row, col;
+       object *monster;
+       short row, col;
 {
        short i, n;
        boolean tried[6];
@@ -427,9 +444,10 @@ O:
        }
 }
 
+int
 mtry(monster, row, col)
-register object *monster;
-register short row, col;
+       object *monster;
+       short row, col;
 {
        if (mon_can_go(monster, row, col)) {
                move_mon_to(monster, row, col);
@@ -438,12 +456,13 @@ register short row, col;
        return(0);
 }
 
+void
 move_mon_to(monster, row, col)
-register object *monster;
-register short row, col;
+       object *monster;
+       short row, col;
 {
        short c;
-       register mrow, mcol;
+       int mrow, mcol;
 
        mrow = monster->row;
        mcol = monster->col;
@@ -488,9 +507,10 @@ register short row, col;
        }
 }
 
+int
 mon_can_go(monster, row, col)
-register object *monster;
-register short row, col;
+       const object *monster;
+       short row, col;
 {
        object *obj;
        short dr, dc;
@@ -529,18 +549,20 @@ register short row, col;
        return(1);
 }
 
+void
 wake_up(monster)
-object *monster;
+       object *monster;
 {
        if (!(monster->m_flags & NAPPING)) {
                monster->m_flags &= (~(ASLEEP | IMITATES | WAKENS));
        }
 }
 
+void
 wake_room(rn, entering, row, col)
-short rn;
-boolean entering;
-short row, col;
+       short rn;
+       boolean entering;
+       short row, col;
 {
        object *monster;
        short wake_percent;
@@ -573,9 +595,9 @@ short row, col;
        }
 }
 
-char *
+const char *
 mon_name(monster)
-object *monster;
+       const object *monster;
 {
        short ch;
 
@@ -591,8 +613,9 @@ object *monster;
        return(m_names[ch]);
 }
 
+int
 rogue_is_around(row, col)
-register row, col;
+       int row, col;
 {
        short rdif, cdif, retval;
 
@@ -603,6 +626,7 @@ register row, col;
        return(retval);
 }
 
+void
 wanderer()
 {
        object *monster;
@@ -633,6 +657,7 @@ wanderer()
        }
 }
 
+void
 show_monsters()
 {
        object *monster;
@@ -654,6 +679,7 @@ show_monsters()
        }
 }
 
+void
 create_monster()
 {
        short row, col;
@@ -689,9 +715,10 @@ create_monster()
        }
 }
 
+void
 put_m_at(row, col, monster)
-short row, col;
-object *monster;
+       short row, col;
+       object *monster;
 {
        monster->row = row;
        monster->col = col;
@@ -701,8 +728,9 @@ object *monster;
        aim_monster(monster);
 }
 
+void
 aim_monster(monster)
-object *monster;
+       object *monster;
 {
        short i, rn, d, r;
 
@@ -719,10 +747,11 @@ object *monster;
        }
 }
 
+int
 rogue_can_see(row, col)
-register row, col;
+       int row, col;
 {
-       register retval;
+       int retval;
 
        retval = !blind &&
                        (((get_room_number(row, col) == cur_room) &&
@@ -732,8 +761,9 @@ register row, col;
        return(retval);
 }
 
+int
 move_confused(monster)
-object *monster;
+       object *monster;
 {
        short i, row, col;
 
@@ -762,8 +792,9 @@ object *monster;
        return(0);
 }
 
+int
 flit(monster)
-object *monster;
+       object *monster;
 {
        short i, row, col;
 
@@ -788,18 +819,20 @@ object *monster;
        return(1);
 }
 
+char
 gr_obj_char()
 {
        short r;
-       char *rs = "%!?]=/):*";
+       const char *rs = "%!?]=/):*";
 
        r = get_rand(0, 8);
 
        return(rs[r]);
 }
 
+int
 no_room_for_monster(rn)
-int rn;
+       int rn;
 {
        short i, j;
 
@@ -813,6 +846,7 @@ int rn;
        return(1);
 }
 
+void
 aggravate()
 {
        object *monster;
@@ -833,7 +867,8 @@ aggravate()
 
 boolean
 mon_sees(monster, row, col)
-object *monster;
+       const object *monster;
+       int row, col;
 {
        short rn, rdif, cdif, retval;
 
@@ -851,6 +886,7 @@ object *monster;
        return(retval);
 }
 
+void
 mv_aquatars()
 {
        object *monster;