switch source tree from k&r to c99

src/mkmap.c

@@ -8,21 +8,19 @@
 #define HEIGHT (ROWNO - 1)
 #define WIDTH (COLNO - 2)
 
-static void FDECL(init_map, (SCHAR_P));
-static void FDECL(init_fill, (SCHAR_P, SCHAR_P));
-static schar FDECL(get_map, (int, int, SCHAR_P));
-static void FDECL(pass_one, (SCHAR_P, SCHAR_P));
-static void FDECL(pass_two, (SCHAR_P, SCHAR_P));
-static void FDECL(pass_three, (SCHAR_P, SCHAR_P));
-static void FDECL(join_map, (SCHAR_P, SCHAR_P));
-static void FDECL(finish_map,
-                      (SCHAR_P, SCHAR_P, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
-static void FDECL(remove_room, (unsigned));
-void FDECL(mkmap, (lev_init *));
+static void init_map(schar);
+static void init_fill(schar, schar);
+static schar get_map(int, int, schar);
+static void pass_one(schar, schar);
+static void pass_two(schar, schar);
+static void pass_three(schar, schar);
+static void join_map(schar, schar);
+static void finish_map(schar, schar, boolean, boolean, boolean);
+static void remove_room(unsigned);
+void mkmap(lev_init *);
 
 static void
-init_map(bg_typ)
-schar bg_typ;
+init_map(schar bg_typ)
 {
     register int i, j;
 
@@ -34,8 +32,7 @@ schar bg_typ;
 }
 
 static void
-init_fill(bg_typ, fg_typ)
-schar bg_typ, fg_typ;
+init_fill(schar bg_typ, schar fg_typ)
 {
     register int i, j;
     long limit, count;
@@ -53,9 +50,7 @@ schar bg_typ, fg_typ;
 }
 
 static schar
-get_map(col, row, bg_typ)
-int col, row;
-schar bg_typ;
+get_map(int col, int row, schar bg_typ)
 {
     if (col <= 0 || row < 0 || col > WIDTH || row >= HEIGHT)
         return bg_typ;
@@ -66,8 +61,7 @@ static const int dirs[16] = { -1, -1 /**/, -1, 0 /**/,  -1, 1 /**/, 0, -1 /**/,
                                0,  1 /**/,  1,  -1 /**/, 1,  0 /**/, 1, 1 };
 
 static void
-pass_one(bg_typ, fg_typ)
-schar bg_typ, fg_typ;
+pass_one(schar bg_typ, schar fg_typ)
 {
     register int i, j;
     short count, dr;
@@ -100,8 +94,7 @@ schar bg_typ, fg_typ;
 #define new_loc(i, j) *(g.new_locations + ((j) * (WIDTH + 1)) + (i))
 
 static void
-pass_two(bg_typ, fg_typ)
-schar bg_typ, fg_typ;
+pass_two(schar bg_typ, schar fg_typ)
 {
     register int i, j;
     short count, dr;
@@ -124,8 +117,7 @@ schar bg_typ, fg_typ;
 }
 
 static void
-pass_three(bg_typ, fg_typ)
-schar bg_typ, fg_typ;
+pass_three(schar bg_typ, schar fg_typ)
 {
     register int i, j;
     short count, dr;
@@ -154,12 +146,12 @@ schar bg_typ, fg_typ;
  * exactly matching levl[sx][sy].typ and walls are included as well.
  */
 void
-flood_fill_rm(sx, sy, rmno, lit, anyroom)
-int sx;
-register int sy;
-register int rmno;
-boolean lit;
-boolean anyroom;
+flood_fill_rm(
+    int sx,
+    register int sy,
+    register int rmno,
+    boolean lit,
+    boolean anyroom)
 {
     register int i;
     int nx;
@@ -247,8 +239,7 @@ boolean anyroom;
 }
 
 static void
-join_map(bg_typ, fg_typ)
-schar bg_typ, fg_typ;
+join_map(schar bg_typ, schar fg_typ)
 {
     register struct mkroom *croom, *croom2;
 
@@ -320,9 +311,12 @@ joinm:
 }
 
 static void
-finish_map(fg_typ, bg_typ, lit, walled, icedpools)
-schar fg_typ, bg_typ;
-boolean lit, walled, icedpools;
+finish_map(
+    schar fg_typ, 
+    schar bg_typ, 
+    boolean lit, 
+    boolean walled, 
+    boolean icedpools)
 {
     int i, j;
 
@@ -361,8 +355,7 @@ boolean lit, walled, icedpools;
  * region are all set.
  */
 void
-remove_rooms(lx, ly, hx, hy)
-int lx, ly, hx, hy;
+remove_rooms(int lx, int ly, int hx, int hy)
 {
     int i;
     struct mkroom *croom;
@@ -393,8 +386,7 @@ int lx, ly, hx, hy;
  * Currently handles only the removal of rooms that have no subrooms.
  */
 static void
-remove_room(roomno)
-unsigned roomno;
+remove_room(unsigned int roomno)
 {
     struct mkroom *croom = &g.rooms[roomno];
     struct mkroom *maxroom = &g.rooms[--g.nroom];
@@ -426,8 +418,7 @@ unsigned roomno;
 #define N_P3_ITER 2 /* tune map smoothing via this value */
 
 boolean
-litstate_rnd(litstate)
-int litstate;
+litstate_rnd(int litstate)
 {
     if (litstate < 0)
         return (rnd(1 + abs(depth(&u.uz))) < 11 && rn2(77)) ? TRUE : FALSE;
@@ -435,8 +426,7 @@ int litstate;
 }
 
 void
-mkmap(init_lev)
-lev_init *init_lev;
+mkmap(lev_init* init_lev)
 {
     schar bg_typ = init_lev->bg, fg_typ = init_lev->fg;
     boolean smooth = init_lev->smoothed, join = init_lev->joined;