diff xrogue/n_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 f54901b9c39b
children e52a8a7ad4c5
line wrap: on
line diff
--- a/xrogue/n_level.c	Fri Feb 26 17:30:30 2016 -0500
+++ b/xrogue/n_level.c	Wed Mar 02 21:28:34 2016 -0500
@@ -20,13 +20,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 = 0, i, cnt;
     register unsigned char ch;
@@ -464,14 +467,15 @@
 
     /* Do we sense any food on this level? */
     if (cur_relic[SURTUR_RING])
-        quaff(P_FFIND, NULL, NULL, FALSE);
+        quaff(P_FFIND, 0, 0, FALSE);
 }
 
 /*
  * Pick a room that is really there
  */
 
-rnd_room()
+int
+rnd_room(void)
 {
     register int rm;
 
@@ -487,10 +491,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;