X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/927a087250c6d788d6df6cc7fcb0359653e2efd3..bdafda27046fab8d24e4e422b04574856b8b1d28:/trek/trek.h?ds=sidebyside

diff --git a/trek/trek.h b/trek/trek.h
index a30d9976..99c61e48 100644
--- a/trek/trek.h
+++ b/trek/trek.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: trek.h,v 1.14 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: trek.h,v 1.18 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -232,7 +232,7 @@ struct Ship_struct {
 	int	secty;		/* sector y coord */
 	unsigned char	cond;	/* condition code */
 	/* sinsbad is set if SINS is working but not calibrated */
-	char	sinsbad;	/* Space Inertial Navigation System condition */
+	char	sinsbad;	/* Space Inertial Navigation System condition*/
 	const char *shipname;	/* name of current starship */
 	char	ship;		/* current starship */
 	int	distressed;	/* number of distress calls */
@@ -321,13 +321,14 @@ extern struct Now_struct Now;
 
 /* Other stuff, not dumped in a snapshot */
 struct Etc_struct {
-	struct kling	klingon[MAXKLQUAD];	/* sorted Klingon list */
-	short		nkling;			/* number of Klingons in this sector */
-						/* < 0 means automatic override mode */
-	char		fast;			/* set if speed > 300 baud */
-	struct xy	starbase;	/* starbase in current quadrant */
-	char		snapshot[sizeof Quad + sizeof Event + sizeof Now];	/* snapshot for time warp */
-	char		statreport;		/* set to get a status report on a srscan */
+	struct kling klingon[MAXKLQUAD];/* sorted Klingon list */
+	short nkling;			/* number of Klingons in this sector */
+					/* < 0 means automatic override mode */
+	char fast;			/* set if speed > 300 baud */
+	struct xy starbase;		/* starbase in current quadrant */
+	char snapshot[sizeof Quad + sizeof Event + sizeof Now];
+					/* snapshot for time warp */
+	char statreport;	/* set to get a status report on a srscan */
 };
 extern struct Etc_struct Etc;
 
@@ -378,10 +379,6 @@ void autover(void);
 
 /* capture.c */
 void capture(int);
-struct kling *selectklingon(void);
-
-/* cgetc.c */
-char cgetc(int);
 
 /* check_out.c */
 int check_out(int);
@@ -449,7 +446,7 @@ void killd(int, int , int);
 void klmove(int);
 
 /* lose.c */
-void lose(int) __attribute__((__noreturn__));
+void lose(int) __dead;
 
 /* lrscan.c */
 void lrscan(int);
@@ -467,8 +464,7 @@ void out(int);
 void phaser(int);
 
 /* play.c */
-void myreset(int) __attribute__((__noreturn__));
-void play(void) __attribute__((__noreturn__));
+void play(void) __dead;
 
 /* ram.c */
 void ram(int, int );
@@ -519,4 +515,4 @@ void dowarp(int);
 void warp(int, int, double);
 
 /* win.c */
-void win(void) __attribute__((__noreturn__));
+void win(void) __dead;