X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/bd10b531314ec546d25fd238f27d94c74a726567..HEAD:/sail/extern.h

diff --git a/sail/extern.h b/sail/extern.h
index d5ae5701..5b6bbba3 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.5 1997/10/13 21:03:49 christos Exp $ */
+/*	$NetBSD: extern.h,v 1.38 2011/08/29 20:30:37 joerg Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,32 +31,30 @@
  *	@(#)externs.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <ctype.h>
-#include <setjmp.h>
+#include <sys/types.h>
+#include <stdbool.h>
+
 #include "machdep.h"
 
 	/* program mode */
-int mode;
-jmp_buf restart;
+extern int mode;
 #define MODE_PLAYER	1
 #define MODE_DRIVER	2
 #define MODE_LOGGER	3
 
 	/* command line flags */
-char debug;				/* -D */
-char randomize;				/* -x, give first available ship */
-char longfmt;				/* -l, print score in long format */
-char nobells;				/* -b, don't ring bell before Signal */
+extern bool randomize;			/* -x, give first available ship */
+extern bool longfmt;			/* -l, print score in long format */
+extern bool nobells;			/* -b, don't ring bell before Signal */
 
-	/* other initial modes */
-char issetuid;				/* running setuid */
+	/* other initial data */
+extern gid_t gid;
+extern gid_t egid;
+#define MAXNAMESIZE	20
+extern char myname[MAXNAMESIZE];
 
-#define die()		((rand() >> 3) % 6 + 1)
+#define dieroll()		((random()) % 6 + 1)
 #define sqr(a)		((a) * (a))
-#define abs(a)		((a) > 0 ? (a) : -(a))
 #define min(a,b)	((a) < (b) ? (a) : (b))
 
 #define grappled(a)	((a)->file->ngrap)
@@ -71,15 +65,17 @@ char issetuid;				/* running setuid */
 #define fouled2(a, b)	((a)->file->foul[(b)->file->index].sn_count)
 #define snagged2(a, b)	(grappled2(a, b) + fouled2(a, b))
 
-#define Xgrappled2(a, b) ((a)->file->grap[(b)->file->index].sn_turn < turn-1 ? grappled2(a, b) : 0)
-#define Xfouled2(a, b)	((a)->file->foul[(b)->file->index].sn_turn < turn-1 ? fouled2(a, b) : 0)
+#define Xgrappled2(a, b) ((a)->file->grap[(b)->file->index].sn_turn < turn-1 \
+			  ? grappled2(a, b) : 0)
+#define Xfouled2(a, b)	((a)->file->foul[(b)->file->index].sn_turn < turn-1 \
+			 ? fouled2(a, b) : 0)
 #define Xsnagged2(a, b)	(Xgrappled2(a, b) + Xfouled2(a, b))
 
 #define cleangrapple(a, b, c)	Cleansnag(a, b, c, 1)
 #define cleanfoul(a, b, c)	Cleansnag(a, b, c, 2)
 #define cleansnag(a, b, c)	Cleansnag(a, b, c, 3)
 
-#define sterncolour(sp)	((sp)->file->stern+'0'-((sp)->file->captured?10:0))
+#define sterncolour(sp)	((sp)->file->stern+'0'-((sp)->file->captured ? 10 : 0))
 #define sternrow(sp)	((sp)->file->row + dr[(sp)->file->dir])
 #define sterncol(sp)	((sp)->file->col + dc[(sp)->file->dir])
 
@@ -107,49 +103,9 @@ char issetuid;				/* running setuid */
 #define HULL		0
 #define RIGGING		1
 
-#define W_CAPTAIN	1
-#define W_CAPTURED	2
-#define W_CLASS		3
-#define W_CREW		4
-#define W_DBP		5
-#define W_DRIFT		6
-#define W_EXPLODE	7
-#define W_FILE		8
-#define W_FOUL		9
-#define W_GUNL		10
-#define W_GUNR		11
-#define W_HULL		12
-#define W_MOVE		13
-#define W_OBP		14
-#define W_PCREW		15
-#define W_UNFOUL	16
-#define W_POINTS	17
-#define W_QUAL		18
-#define W_UNGRAP	19
-#define W_RIGG		20
-#define W_COL		21
-#define W_DIR		22
-#define W_ROW		23
-#define W_SIGNAL	24
-#define W_SINK		25
-#define W_STRUCK	26
-#define W_TA		27
-#define W_ALIVE		28
-#define W_TURN		29
-#define W_WIND		30
-#define W_FS		31
-#define W_GRAP		32
-#define W_RIG1		33
-#define W_RIG2		34
-#define W_RIG3		35
-#define W_RIG4		36
-#define W_BEGIN		37
-#define W_END		38
-#define W_DDEAD		39
-
 #define NLOG 10
 struct logs {
-	char l_name[20];
+	char l_name[MAXNAMESIZE];
 	int l_uid;
 	int l_shipnum;
 	int l_gamenum;
@@ -157,8 +113,8 @@ struct logs {
 };
 
 struct BP {
-	short turnsent;
 	struct ship *toship;
+	short turnsent;
 	short mensent;
 };
 
@@ -167,7 +123,7 @@ struct snag {
 	short sn_turn;
 };
 
-#define NSCENE	nscene
+#define NSCENE	/*nscene*/ 32
 #define NSHIP	10
 #define NBP	3
 
@@ -183,7 +139,7 @@ struct snag {
 
 struct File {
 	int index;
-	char captain[20];		/* 0 */
+	char captain[MAXNAMESIZE];	/* 0 */
 	short points;			/* 20 */
 	unsigned char loadL;		/* 22 */
 	unsigned char loadR;		/* 24 */
@@ -214,7 +170,7 @@ struct File {
 };
 
 struct ship {
-	char *shipname;			/* 0 */
+	const char *shipname;		/* 0 */
 	struct shipspecs *specs;	/* 2 */
 	unsigned char nationality;	/* 4 */
 	short shiprow;			/* 6 */
@@ -228,11 +184,11 @@ struct scenario {
 	char windspeed;			/* 2 */
 	char windchange;		/* 4 */
 	unsigned char vessels;		/* 12 */
-	char *name;			/* 14 */
+	const char *name;		/* 14 */
 	struct ship ship[NSHIP];	/* 16 */
 };
-struct scenario scene[];
-int nscene;
+extern struct scenario scene[NSCENE];
+extern int nscene;
 
 struct shipspecs {
 	char bs;
@@ -255,10 +211,9 @@ struct shipspecs {
 	int rig4;
 	short pts;
 };
-struct shipspecs specs[];
 
-struct scenario *cc;		/* the current scenario */
-struct ship *ls;		/* &cc->ship[cc->vessels] */
+extern struct scenario *cc;		/* the current scenario */
+extern struct ship *ls;		/* &cc->ship[cc->vessels] */
 
 #define SHIP(s)		(&cc->ship[s])
 #define foreachship(sp)	for ((sp) = cc->ship; (sp) < ls; (sp)++)
@@ -266,175 +221,190 @@ struct ship *ls;		/* &cc->ship[cc->vessels] */
 struct windeffects {
 	char A, B, C, D;
 };
-struct windeffects WET[7][6];
+extern const struct windeffects WET[7][6];
 
 struct Tables {
 	char H, G, C, R;
 };
-struct Tables RigTable[11][6];
-struct Tables HullTable[11][6];
+extern const struct Tables RigTable[11][6];
+extern const struct Tables HullTable[11][6];
+
+extern const char AMMO[9][4];
+extern const char HDT[9][10];
+extern const char HDTrake[9][10];
+extern const char QUAL[9][5];
+extern const char MT[9][3];
 
-char AMMO[9][4];
-char HDT[9][10];
-char HDTrake[9][10];
-char QUAL[9][5];
-char MT[9][3];
+extern const char *const countryname[];
+extern const char *const shortclassname[];
+extern const char *const classname[];
+extern const char *const directionname[];
+extern const char *const qualname[];
+extern const char loadname[];
 
-char *countryname[];
-char *classname[];
-char *directionname[];
-char *qualname[];
-char loadname[];
+extern const char rangeofshot[];
 
-char rangeofshot[];
+extern const char dr[], dc[];
 
-char dr[], dc[];
+extern int winddir;
+extern int windspeed;
+extern int turn;
+extern int game;
+extern int alive;
+extern int people;
+extern int hasdriver;
 
-int winddir;
-int windspeed;
-int turn;
-int game;
-int alive;
-int people;
-char hasdriver;
 
 /* assorted.c */
-void table __P((int, int, int, struct ship *, struct ship *, int));
-void Cleansnag __P((struct ship *, struct ship *, int, int));
+void table(struct ship *, struct ship *, int, int, int, int);
+void Cleansnag(struct ship *, struct ship *, int, int);
 
 /* dr_1.c */
-void unfoul __P((void));
-void boardcomp __P((void));
-int fightitout __P((struct ship *, struct ship *, int));
-void resolve __P((void));
-void compcombat __P((void));
-int next __P((void));
+void unfoul(void);
+void boardcomp(void);
+void resolve(void);
+void compcombat(void);
+int next(void);
 
 /* dr_2.c */
-void thinkofgrapples __P((void));
-void checkup __P((void));
-void prizecheck __P((void));
-int strend __P((char *));
-void closeon __P((struct ship *, struct ship *, char[], int, int, int));
-int score __P((char[], struct ship *, struct ship *, int));
-void move __P((char *, struct ship *, unsigned char *, short *, short *, char *));
-void try __P((char[], char [], int, int, int, int, int, struct ship *,
-    struct ship *, int *, int));
-void rmend __P((char *));
+void thinkofgrapples(void);
+void checkup(void);
+void prizecheck(void);
+void closeon(struct ship *, struct ship *, char *, size_t, int, int, bool);
 
 /* dr_3.c */
-void moveall __P((void));
-int stillmoving __P((int));
-int isolated __P((struct ship *));
-int push __P((struct ship *, struct ship *));
-void step __P((int, struct ship *, char *));
-void sendbp __P((struct ship *, struct ship *, int, int));
-int toughmelee __P((struct ship *, struct ship *, int, int));
-void reload __P((void));
-void checksails __P((void));
+void moveall(void);
+void sendbp(struct ship *, struct ship *, int, int);
+int is_toughmelee(struct ship *, struct ship *, int, int);
+void reload(void);
+void checksails(void);
 
 /* dr_4.c */
-void ungrap __P((struct ship *, struct ship *));
-void grap __P((struct ship *, struct ship *));
+void ungrap(struct ship *, struct ship *);
+void grap(struct ship *, struct ship *);
 
 /* dr_5.c */
-void subtract __P((struct ship *, int, int [3], struct ship *, int));
-int mensent __P((struct ship *, struct ship *, int[3], struct ship **, int *,
-    int));
+void subtract(struct ship *, struct ship *, int, int [3], int);
+int mensent(struct ship *, struct ship *, int[3], struct ship **, int *, int);
 
 /* dr_main.c */
-int dr_main __P((void));
+int dr_main(void);
+void startdriver(void);
 
 /* game.c */
-int maxturns __P((struct ship *, char *));
-int maxmove __P((struct ship *, int, int));
+int maxturns(struct ship *, bool *);
+int maxmove(struct ship *, int, int);
 
 /* lo_main.c */
-int lo_main __P((void));
+void lo_curses(void);
+int lo_main(void);
 
 /* misc.c */
-int range __P((struct ship *, struct ship *));
-struct ship *closestenemy __P((struct ship *, int, int));
-int angle __P((int, int));
-int gunsbear __P((struct ship *, struct ship *));
-int portside __P((struct ship *, struct ship *, int));
-int colours __P((struct ship *));
-void logger __P((struct ship *));
+int range(struct ship *, struct ship *);
+struct ship *closestenemy(struct ship *, int, int);
+int gunsbear(struct ship *, struct ship *);
+int portside(struct ship *, struct ship *, int);
+int colours(struct ship *);
+void logger(struct ship *);
 
 /* parties.c */
-int meleeing __P((struct ship *, struct ship *));
-int boarding __P((struct ship *, int));
-void unboard __P((struct ship *, struct ship *, int));
+int meleeing(struct ship *, struct ship *);
+int boarding(struct ship *, int);
+void unboard(struct ship *, struct ship *, int);
 
 /* pl_1.c */
-void leave __P((int));
-void choke __P((int));
-void child __P((int));
+void leave(int) __dead;
+void choke(int) __dead;
+void child(int);
 
 /* pl_2.c */
-void play __P((void));
+void newturn(int);
+void play(void) __dead;
 
 /* pl_3.c */
-void acceptcombat __P((void));
-void grapungrap __P((void));
-void unfoulplayer __P((void));
+void acceptcombat(void);
+void grapungrap(void);
+void unfoulplayer(void);
 
 /* pl_4.c */
-void changesail __P((void));
-void acceptsignal __P((void));
-void lookout __P((void));
-char *saywhat __P((struct ship *, int));
-void eyeball __P((struct ship *));
+void changesail(void);
+void acceptsignal(void);
+void lookout(void);
+const char *saywhat(struct ship *, int);
+void eyeball(struct ship *);
 
 /* pl_5.c */
-void acceptmove __P((void));
-void acceptboard __P((void));
-void parties __P((int[3], struct ship *, int, int));
+void acceptmove(void);
+void acceptboard(void);
 
 /* pl_6.c */
-void repair __P((void));
-int turned __P((void));
-void loadplayer __P((void));
+void repair(void);
+void loadplayer(void);
 
 /* pl_7.c */
-void initscreen __P((void));
-void cleanupscreen __P((void));
-void newturn __P((int));
-void Signal __P((const char *, struct ship *, ...))
-	 __attribute__((__format__(__printf__,1,3)));
-void Msg __P((const char *, ...))
-	 __attribute__((__format__(__printf__,1,2)));
-void Scroll __P((void));
-void prompt __P((char *, struct ship *));
-void endprompt __P((int));
-int sgetch __P((char *, struct ship *, int));
-void sgetstr __P((char *, char *, int));
-void draw_screen __P((void));
-void draw_view __P((void));
-void draw_turn __P((void));
-void draw_stat __P((void));
-void draw_slot __P((void));
-void draw_board __P((void));
-void centerview __P((void));
-void upview __P((void));
-void downview __P((void));
-void leftview __P((void));
-void rightview __P((void));
-void adjustview __P((void));
+void initscreen(void);
+void cleanupscreen(void);
+void Signal(const char *, struct ship *, ...) __printflike(1,3);
+void Msg(const char *, ...) __printflike(1,2);
+int sgetch(const char *, struct ship *, int);
+void sgetstr(const char *, char *, int);
+void centerview(void);
+void upview(void);
+void downview(void);
+void leftview(void);
+void rightview(void);
+void startup(void);
 
 /* pl_main.c */
-int pl_main __P((void));
-void initialize __P((void));
+void pl_main_init(void);
+void pl_main_uninit(void);
+__dead void pl_main(void);
 
 /* sync.c */
-void fmtship __P((char *, size_t, const char *, struct ship *));
-void makesignal __P((struct ship *, const char *, struct ship *, ...))
-	 __attribute__((__format__(__printf__,2,4)));
-void makemsg __P((struct ship *, const char *, ...))
-	 __attribute__((__format__(__printf__,2,3)));
-int sync_exists __P((int));
-int sync_open __P((void));
-void sync_close __P((int));
-void Write __P((int, struct ship *, int, long, long, long, long));
-int Sync __P((void));
-int sync_update __P((int, struct ship *, long, long, long, long));
+void fmtship(char *, size_t, const char *, struct ship *);
+void makesignal(struct ship *, const char *, struct ship *, ...)
+	__printflike(2,4);
+void makemsg(struct ship *, const char *, ...) __printflike(2, 3);
+int sync_exists(int);
+int sync_open(void);
+void sync_close(int);
+int Sync(void);
+
+void send_captain(struct ship *ship, const char *astr);
+void send_captured(struct ship *ship, long a);
+void send_class(struct ship *ship, long a);
+void send_crew(struct ship *ship, long a, long b, long c);
+void send_dbp(struct ship *ship, long a, long b, long c, long d);
+void send_drift(struct ship *ship, long a);
+void send_explode(struct ship *ship, long a);
+void send_foul(struct ship *ship, long a);
+void send_gunl(struct ship *ship, long a, long b);
+void send_gunr(struct ship *ship, long a, long b);
+void send_hull(struct ship *ship, long a);
+void send_move(struct ship *ship, const char *astr);
+void send_obp(struct ship *ship, long a, long b, long c, long d);
+void send_pcrew(struct ship *ship, long a);
+void send_unfoul(struct ship *ship, long a, long b);
+void send_points(struct ship *ship, long a);
+void send_qual(struct ship *ship, long a);
+void send_ungrap(struct ship *ship, long a, long b);
+void send_rigg(struct ship *ship, long a, long b, long c, long d);
+void send_col(struct ship *ship, long a);
+void send_dir(struct ship *ship, long a);
+void send_row(struct ship *ship, long a);
+void send_signal(struct ship *ship, const char *astr);
+void send_sink(struct ship *ship, long a);
+void send_struck(struct ship *ship, long a);
+void send_ta(struct ship *ship, long a);
+void send_alive(void);
+void send_turn(long a);
+void send_wind(long a, long b);
+void send_fs(struct ship *ship, long a);
+void send_grap(struct ship *ship, long a);
+void send_rig1(struct ship *ship, long a);
+void send_rig2(struct ship *ship, long a);
+void send_rig3(struct ship *ship, long a);
+void send_rig4(struct ship *ship, long a);
+void send_begin(struct ship *ship);
+void send_end(struct ship *ship);
+void send_ddead(void);