Mercurial > hg > early-roguelike
diff srogue/disply.c @ 225:4f6e056438eb
Merge the GCC5 and build fix branches.
author | John "Elwin" Edwards |
---|---|
date | Wed, 02 Mar 2016 21:28:34 -0500 |
parents | 94a0d9dd5ce1 |
children | e52a8a7ad4c5 |
line wrap: on
line diff
--- a/srogue/disply.c Fri Feb 26 17:30:30 2016 -0500 +++ b/srogue/disply.c Wed Mar 02 21:28:34 2016 -0500 @@ -18,7 +18,8 @@ * displevl: * Display detailed level for wizard and scroll */ -displevl() +void +displevl(void) { reg char ch, mch; reg int i,j; @@ -73,7 +74,8 @@ * dispmons: * Show monsters for wizard and potion */ -dispmons() +void +dispmons(void) { reg int ch, y, x; reg struct thing *it; @@ -95,8 +97,8 @@ * winat: * Get whatever character is at a location on the screen */ -winat(y, x) -int x, y; +char +winat(int y, int x) { reg char ch; @@ -111,8 +113,8 @@ * cordok: * Returns TRUE if coordinate is on usable screen */ -cordok(y, x) -int y, x; +bool +cordok(int y, int x) { if (x < 0 || y < 0 || x >= COLS || y >= LINES - 1) return FALSE; @@ -123,8 +125,8 @@ * pl_on: * Returns TRUE if the player's flag is set */ -pl_on(what) -long what; +bool +pl_on(long what) { return (player.t_flags & what); } @@ -134,8 +136,8 @@ * pl_off: * Returns TRUE when player's flag is reset */ -pl_off(what) -long what; +bool +pl_off(long what) { return (!(player.t_flags & what)); } @@ -145,9 +147,8 @@ * o_on: * Returns TRUE in the objects flag is set */ -o_on(what,bit) -struct object *what; -long bit; +bool +o_on(struct object *what, long bit) { reg int flag; @@ -162,9 +163,8 @@ * o_off: * Returns TRUE is the objects flag is reset */ -o_off(what,bit) -struct object *what; -long bit; +bool +o_off(struct object *what, long bit) { reg int flag; @@ -179,9 +179,8 @@ * setoflg: * Set the specified flag for the object */ -setoflg(what,bit) -struct object *what; -long bit; +void +setoflg(struct object *what, long bit) { what->o_flags |= bit; } @@ -191,9 +190,8 @@ * resoflg: * Reset the specified flag for the object */ -resoflg(what,bit) -struct object *what; -long bit; +void +resoflg(struct object *what, long bit) { what->o_flags &= ~bit; }