diff options
author | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-09-19 15:19:46 +0000 |
---|---|---|
committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-09-19 15:19:46 +0000 |
commit | 3e18837b3ae2c097cd8b97bdca21beea24edf1bf (patch) | |
tree | 5064c185591427acce28fd45224932161db70837 /games/hunt/huntd | |
parent | 1b25d0ca2bbb4eb5720b329fa7c9b312322af918 (diff) |
isplayer -> is_player gets out of <ctype.h> namespace; jsm28@cam.ac.uk
Diffstat (limited to 'games/hunt/huntd')
-rw-r--r-- | games/hunt/huntd/draw.c | 6 | ||||
-rw-r--r-- | games/hunt/huntd/hunt.h | 4 | ||||
-rw-r--r-- | games/hunt/huntd/shots.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/games/hunt/huntd/draw.c b/games/hunt/huntd/draw.c index b7b344bf064..745a5a0e205 100644 --- a/games/hunt/huntd/draw.c +++ b/games/hunt/huntd/draw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: draw.c,v 1.4 2001/02/13 11:55:10 pjanzen Exp $ */ +/* $OpenBSD: draw.c,v 1.5 2001/09/19 15:19:45 pjanzen Exp $ */ /* $NetBSD: draw.c,v 1.2 1997/10/10 16:33:04 lukem Exp $ */ /* * Hunt @@ -43,7 +43,7 @@ drawmaze(pp) if (pp->p_x == x && pp->p_y == y) outch(pp, translate(*sp)); /* Possibly draw other players as team nrs */ - else if (isplayer(*sp)) + else if (is_player(*sp)) outch(pp, player_sym(pp, y, x)); else outch(pp, *sp); @@ -224,7 +224,7 @@ check(pp, y, x) cgoto(rpp, y, x); if (x == rpp->p_x && y == rpp->p_y) outch(rpp, translate(ch)); - else if (isplayer(ch)) + else if (is_player(ch)) outch(rpp, player_sym(rpp, y, x)); else outch(rpp, ch); diff --git a/games/hunt/huntd/hunt.h b/games/hunt/huntd/hunt.h index fa8e083c89f..de1744e857d 100644 --- a/games/hunt/huntd/hunt.h +++ b/games/hunt/huntd/hunt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hunt.h,v 1.3 1999/01/29 07:30:36 d Exp $ */ +/* $OpenBSD: hunt.h,v 1.4 2001/09/19 15:19:45 pjanzen Exp $ */ /* $NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf Exp $ */ /* @@ -81,7 +81,7 @@ typedef int FLAG; # define RIGHT '}' # define LEFTS '{' # define FLYER '&' -# define isplayer(c) (c == LEFTS || c == RIGHT ||\ +# define is_player(c) (c == LEFTS || c == RIGHT ||\ c == ABOVE || c == BELOW || c == FLYER) # ifndef TRUE diff --git a/games/hunt/huntd/shots.c b/games/hunt/huntd/shots.c index dfbb716bc1a..9ae2b1086e3 100644 --- a/games/hunt/huntd/shots.c +++ b/games/hunt/huntd/shots.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shots.c,v 1.4 1999/02/01 06:53:56 d Exp $ */ +/* $OpenBSD: shots.c,v 1.5 2001/09/19 15:19:45 pjanzen Exp $ */ /* $NetBSD: shots.c,v 1.3 1997/10/11 08:13:50 lukem Exp $ */ /* * Hunt @@ -433,19 +433,19 @@ move_drone(bp) PLAYER *pp; /* See if we can give someone a blast: */ - if (isplayer(Maze[bp->b_y][bp->b_x - 1])) { + if (is_player(Maze[bp->b_y][bp->b_x - 1])) { dir = WEST; goto drone_move; } - if (isplayer(Maze[bp->b_y - 1][bp->b_x])) { + if (is_player(Maze[bp->b_y - 1][bp->b_x])) { dir = NORTH; goto drone_move; } - if (isplayer(Maze[bp->b_y + 1][bp->b_x])) { + if (is_player(Maze[bp->b_y + 1][bp->b_x])) { dir = SOUTH; goto drone_move; } - if (isplayer(Maze[bp->b_y][bp->b_x + 1])) { + if (is_player(Maze[bp->b_y][bp->b_x + 1])) { dir = EAST; goto drone_move; } |