diff rogue4/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 1b73a8641b37
children e52a8a7ad4c5
line wrap: on
line diff
--- a/rogue4/rooms.c	Fri Feb 26 17:30:30 2016 -0500
+++ b/rogue4/rooms.c	Wed Mar 02 21:28:34 2016 -0500
@@ -16,11 +16,16 @@
 
 #define GOLDGRP 1
 
+void draw_room(struct room *rp);
+void vert(struct room *rp, int startx);
+void horiz(struct room *rp, int starty);
+
 /*
  * do_rooms:
  *	Create rooms and corridors with a connectivity graph
  */
-do_rooms()
+void
+do_rooms(void)
 {
     register int i;
     register struct room *rp;
@@ -120,8 +125,8 @@
  * draw_room:
  *	Draw a box around a room and lay down the floor
  */
-draw_room(rp)
-register struct room *rp;
+void
+draw_room(struct room *rp)
 {
     register int y, x;
 
@@ -147,9 +152,8 @@
  * vert:
  *	Draw a vertical line
  */
-vert(rp, startx)
-register struct room *rp;
-register int startx;
+void
+vert(struct room *rp, int startx)
 {
     register int y;
 
@@ -161,9 +165,8 @@
  * horiz:
  *	Draw a horizontal line
  */
-horiz(rp, starty)
-register struct room *rp;
-int starty;
+void
+horiz(struct room *rp, int starty)
 {
     register int x;
 
@@ -175,9 +178,8 @@
  * rnd_pos:
  *	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;
@@ -187,8 +189,8 @@
  * enter_room:
  *	Code that is executed whenver you appear in a room
  */
-enter_room(cp)
-register coord *cp;
+void
+enter_room(coord *cp)
 {
     register struct room *rp;
     register int y, x;
@@ -220,8 +222,8 @@
  * leave_room:
  *	Code for when we exit a room
  */
-leave_room(cp)
-register coord *cp;
+void
+leave_room(coord *cp)
 {
     register int y, x;
     register struct room *rp;