Mercurial > hg > early-roguelike
diff xrogue/outside.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/outside.c Fri Feb 26 17:30:30 2016 -0500 +++ b/xrogue/outside.c Wed Mar 02 21:28:34 2016 -0500 @@ -15,7 +15,8 @@ #include <curses.h> #include "rogue.h" -extern char rnd_terrain(), get_terrain(); +char rnd_terrain(void); +char get_terrain(char one, char two, char three, char four); /* * init_terrain: @@ -23,7 +24,7 @@ */ void -init_terrain() +init_terrain(void) { register struct room *rp; @@ -40,9 +41,7 @@ } void -do_terrain(basey, basex, deltay, deltax, fresh) -int basey, basex, deltay, deltax; -bool fresh; +do_terrain(int basey, int basex, int deltay, int deltax, bool fresh) { register int cury, curx; /* Current y and x positions */ @@ -140,7 +139,7 @@ */ char -rnd_terrain() +rnd_terrain(void) { int chance = rnd(100); @@ -164,8 +163,7 @@ */ char -get_terrain(one, two, three, four) -char one, two, three, four; +get_terrain(char one, char two, char three, char four) { register int i; int forest = 0, mountain = 0, lake = 0, meadow = 0, total = 0;