Mercurial > hg > early-roguelike
diff arogue7/new_level.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/new_level.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue7/new_level.c Wed Mar 02 21:28:34 2016 -0500 @@ -16,14 +16,16 @@ #include "rogue.h" #define TERRASAVE 3 +void put_things(LEVTYPE ltype); + /* * new_level: * Dig and draw a new level - * + * ltype: designates type of level to create */ -new_level(ltype) -LEVTYPE ltype; /* designates type of level to create */ +void +new_level(LEVTYPE ltype) { register int rm, i, cnt; register char ch; @@ -434,14 +436,15 @@ status(TRUE); /* Do we sense any food on this level? */ - if (cur_relic[SURTUR_RING]) quaff(P_FFIND, NULL, NULL, FALSE); + if (cur_relic[SURTUR_RING]) quaff(P_FFIND, 0, 0, FALSE); } /* * Pick a room that is really there */ -rnd_room() +int +rnd_room(void) { register int rm; @@ -457,10 +460,11 @@ /* * put_things: * put potions and scrolls on this level + * ltype: designates type of level to create */ -put_things(ltype) -LEVTYPE ltype; /* designates type of level to create */ +void +put_things(LEVTYPE ltype) { register int i, rm, cnt; register struct object *cur; @@ -478,7 +482,7 @@ * There is a chance that there is a treasure room on this level */ if (ltype != MAZELEV && rnd(HARDER) < level - 10) { - register j; + int j; register struct room *rp; /* Count the number of free spaces */