Mercurial > hg > early-roguelike
diff arogue7/rooms.c @ 225:4f6e056438eb
Merge the GCC5 and build fix branches.
author | John "Elwin" Edwards |
---|---|
date | Wed, 02 Mar 2016 21:28:34 -0500 |
parents | f9ef86cf22b2 |
children |
line wrap: on
line diff
--- a/arogue7/rooms.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue7/rooms.c Wed Mar 02 21:28:34 2016 -0500 @@ -21,7 +21,11 @@ #include "curses.h" #include "rogue.h" -do_rooms() +void horiz(int cnt); +void vert(int cnt); + +void +do_rooms(void) { register int i; register struct room *rp; @@ -108,7 +112,7 @@ has_gold = TRUE; /* This room has gold in it */ - item = spec_item(GOLD, NULL, NULL, NULL); + item = spec_item(GOLD, 0, 0, 0); cur = OBJPTR(item); /* Put the gold into the level list of items */ @@ -178,9 +182,7 @@ */ coord * -doorway(rp, door) -register struct room *rp; -register coord *door; +doorway(struct room *rp, coord *door) { register int misses = 0; static coord answer; @@ -209,8 +211,8 @@ * Draw a box around a room */ -draw_room(rp) -register struct room *rp; +void +draw_room(struct room *rp) { register int j, k; @@ -237,8 +239,8 @@ * draw a horizontal line */ -horiz(cnt) -register int cnt; +void +horiz(int cnt) { while (cnt--) addch('-'); @@ -249,9 +251,8 @@ * pick a random spot in a room */ -rnd_pos(rp, cp) -register struct room *rp; -register coord *cp; +void +rnd_pos(struct room *rp, coord *cp) { cp->x = rp->r_pos.x + rnd(rp->r_max.x-2) + 1; cp->y = rp->r_pos.y + rnd(rp->r_max.y-2) + 1; @@ -266,8 +267,7 @@ */ struct room * -roomin(cp) -register coord *cp; +roomin(coord *cp) { register struct room *rp; @@ -282,8 +282,8 @@ * draw a vertical line */ -vert(cnt) -register int cnt; +void +vert(int cnt) { register int x, y;