define global vars with `extern' in "back.h", and only define once in

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

diff --git a/rogue/level.c b/rogue/level.c
index 7ea14855e936ab1fbe33a6df473d0e594145dcab..42fff03569d075f2e593d2207c9fbe6dbf5e8cad 100644 (file)
--- a/rogue/level.c
+++ b/rogue/level.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: level.c,v 1.4 1997/10/12 11:45:16 lukem 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: @(#)level.c    5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: level.c,v 1.2 1993/08/01 18:52:28 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)level.c    8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: level.c,v 1.4 1997/10/12 11:45:16 lukem Exp $");
+#endif
 #endif /* not lint */
 
 /*
@@ -88,16 +94,14 @@ long level_points[MAX_EXP_LEVEL] = {
 
 short random_rooms[MAXROOMS] = {3, 7, 5, 2, 0, 6, 1, 4, 8};
 
-extern boolean being_held, wizard, detect_monster;
-extern boolean see_invisible;
-extern short bear_trap, levitate, extra_hp, less_hp, cur_room;
-
+void
 make_level()
 {
        short i, j;
        short must_1, must_2, must_3;
        boolean big_room;
 
+       must_2 = must_3 = 0;
        if (cur_level < LAST_DUNGEON) {
                cur_level++;
        }
@@ -189,14 +193,16 @@ make_level()
        }
 }
 
+void
 make_room(rn, r1, r2, r3)
-short rn, r1, r2, r3;
+       short rn, r1, r2, r3;
 {
        short left_col, right_col, top_row, bottom_row;
        short width, height;
        short row_offset, col_offset;
        short i, j, ch;
 
+       left_col = right_col = top_row = bottom_row = 0;
        switch(rn) {
        case 0:
                left_col = 0;
@@ -298,8 +304,9 @@ END:
        rooms[rn].right_col = right_col;
 }
 
+int
 connect_rooms(room1, room2)
-short room1, room2;
+       short room1, room2;
 {
        short row1, col1, row2, col2, dir;
 
@@ -345,6 +352,7 @@ short room1, room2;
        return(1);
 }
 
+void
 clear_level()
 {
        short i, j;
@@ -371,10 +379,11 @@ clear_level()
        clear();
 }
 
+void
 put_door(rm, dir, row, col)
-room *rm;
-short dir;
-short *row, *col;
+       room *rm;
+       short dir;
+       short *row, *col;
 {
        short wall_width;
 
@@ -408,8 +417,9 @@ short *row, *col;
        rm->doors[dir/2].door_col = *col;
 }
 
+void
 draw_simple_passage(row1, col1, row2, col2, dir)
-short row1, col1, row2, col2, dir;
+       short row1, col1, row2, col2, dir;
 {
        short i, middle, t;
 
@@ -449,16 +459,21 @@ short row1, col1, row2, col2, dir;
        }
 }
 
+int
 same_row(room1, room2)
+       int room1, room2;
 {
        return((room1 / 3) == (room2 / 3));
 }
 
+int
 same_col(room1, room2)
+       int room1, room2;
 {
        return((room1 % 3) == (room2 % 3));
 }
 
+void
 add_mazes()
 {
        short i, j;
@@ -490,6 +505,7 @@ add_mazes()
        }
 }
 
+void
 fill_out_level()
 {
        short i, rn;
@@ -510,9 +526,10 @@ fill_out_level()
        }
 }
 
+void
 fill_it(rn, do_rec_de)
-int rn;
-boolean do_rec_de;
+       int rn;
+       boolean do_rec_de;
 {
        short i, tunnel_dir, door_dir, drow, dcol;
        short target_room, rooms_found = 0;
@@ -571,10 +588,11 @@ boolean do_rec_de;
        }
 }
 
+void
 recursive_deadend(rn, offsets, srow, scol)
-short rn;
-short *offsets;
-short srow, scol;
+       short rn;
+       short *offsets;
+       short srow, scol;
 {
        short i, de;
        short drow, dcol, tunnel_dir;
@@ -608,9 +626,9 @@ short srow, scol;
 
 boolean
 mask_room(rn, row, col, mask)
-short rn;
-short *row, *col;
-unsigned short mask;
+       short rn;
+       short *row, *col;
+       unsigned short mask;
 {
        short i, j;
 
@@ -626,8 +644,9 @@ unsigned short mask;
        return(0);
 }
 
+void
 make_maze(r, c, tr, br, lc, rc)
-short r, c, tr, br, lc, rc;
+       short r, c, tr, br, lc, rc;
 {
        char dirs[4];
        short i, t;
@@ -691,8 +710,9 @@ short r, c, tr, br, lc, rc;
        }
 }
 
+void
 hide_boxed_passage(row1, col1, row2, col2, n)
-short row1, col1, row2, col2, n;
+       short row1, col1, row2, col2, n;
 {
        short i, j, t;
        short row, col, row_cut, col_cut;
@@ -726,8 +746,9 @@ short row1, col1, row2, col2, n;
        }
 }
 
+void
 put_player(nr)
-short nr;              /* try not to put in this room */
+       short nr;               /* try not to put in this room */
 {
        short rn = nr, misses;
        short row, col;
@@ -758,6 +779,7 @@ short nr;           /* try not to put in this room */
        mvaddch(rogue.row, rogue.col, rogue.fchar);
 }
 
+int
 drop_check()
 {
        if (wizard) {
@@ -774,6 +796,7 @@ drop_check()
        return(0);
 }
 
+int
 check_up()
 {
        if (!wizard) {
@@ -796,9 +819,10 @@ check_up()
        return(0);
 }
 
+void
 add_exp(e, promotion)
-int e;
-boolean promotion;
+       int e;
+       boolean promotion;
 {
        char mbuf[40];
        short new_exp;
@@ -827,8 +851,9 @@ boolean promotion;
        }
 }
 
+int
 get_exp_level(e)
-long e;
+       long e;
 {
        short i;
 
@@ -840,6 +865,7 @@ long e;
        return(i+1);
 }
 
+int
 hp_raise()
 {
        int hp;
@@ -848,6 +874,7 @@ hp_raise()
        return(hp);
 }
 
+void
 show_average_hp()
 {
        char mbuf[80];
@@ -867,6 +894,7 @@ show_average_hp()
        message(mbuf, 0);
 }
 
+void
 mix_random_rooms()
 {
        short i, t;