diff options
author | dholland <dholland@NetBSD.org> | 2014-03-29 19:41:10 +0000 |
---|---|---|
committer | dholland <dholland@NetBSD.org> | 2014-03-29 19:41:10 +0000 |
commit | b432256ee8cb43f841c457f6d542c54fc98291e0 (patch) | |
tree | be5c4234c2eb39a573a0c172953d2d5a5210c2e7 /hunt/huntd/hunt.h | |
parent | fa3a22500af8a864dcb4e24df60437f2c8503df7 (diff) | |
download | bsdgames-darwin-b432256ee8cb43f841c457f6d542c54fc98291e0.tar.gz bsdgames-darwin-b432256ee8cb43f841c457f6d542c54fc98291e0.tar.zst bsdgames-darwin-b432256ee8cb43f841c457f6d542c54fc98291e0.zip |
don't declare own boolean type
Diffstat (limited to 'hunt/huntd/hunt.h')
-rw-r--r-- | hunt/huntd/hunt.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/hunt/huntd/hunt.h b/hunt/huntd/hunt.h index 116a418c..122e7468 100644 --- a/hunt/huntd/hunt.h +++ b/hunt/huntd/hunt.h @@ -1,4 +1,4 @@ -/* $NetBSD: hunt.h,v 1.19 2009/08/12 07:42:11 dholland Exp $ */ +/* $NetBSD: hunt.h,v 1.20 2014/03/29 19:41:10 dholland Exp $ */ /* * Copyright (c) 1983-2003, Regents of the University of California. @@ -33,6 +33,7 @@ #include "bsd.h" +#include <stdbool.h> #include <stdio.h> #include <string.h> @@ -186,11 +187,6 @@ #define EAST 010 #define WEST 020 -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - #undef CTRL #define CTRL(x) ((x) & 037) @@ -268,7 +264,6 @@ extern int slime_req[]; #define stat_char(pp) (((pp)->p_cloak < 0) ? _scan_char(pp) : '+') #endif -typedef int FLAG; typedef struct bullet_def BULLET; typedef struct expl_def EXPL; typedef struct player_def PLAYER; @@ -340,7 +335,7 @@ struct bullet_def { char b_over; PLAYER *b_owner; IDENT *b_score; - FLAG b_expl; + bool b_expl; BULLET *b_next; }; @@ -359,7 +354,7 @@ struct regen_def { * external variables */ -extern FLAG Last_player; +extern bool Last_player; extern char Buf[BUFSIZ], Maze[HEIGHT][WIDTH2], Orig_maze[HEIGHT][WIDTH2]; @@ -393,7 +388,7 @@ extern PLAYER Boot[NBOOTS]; #endif #ifdef MONITOR -extern FLAG Am_monitor; +extern bool Am_monitor; extern PLAYER Monitor[MAXMON], *End_monitor; #endif @@ -402,7 +397,7 @@ extern char *Send_message; #endif extern char map_key[256]; -extern FLAG no_beep; +extern bool no_beep; /* * function types @@ -425,7 +420,7 @@ BULLET *create_shot(int, int, int, char, int, int, PLAYER *, void do_connect(char *, char, long); void do_message(void); void drawmaze(PLAYER *); -void drawplayer(PLAYER *, FLAG); +void drawplayer(PLAYER *, bool); void execute(PLAYER *); void faketalk(void); void fixshots(int, int, char); @@ -438,7 +433,7 @@ void message(PLAYER *, const char *); void mon_execute(PLAYER *); void moveshots(void); void open_ctl(void); -int opposite(int, char); +bool opposite(int, char); void otto(int, int, char); void outch(PLAYER *, int); void outstr(PLAYER *, const char *, int); |