From ebc4fdc3802c47c9fe7ec31b4cde062faff366fc Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 14 Sep 2006 20:58:49 +0000
Subject: [PATCH] Various declaration cleanups.

---
 src/io.c  |  6 ++++++
 src/sst.h | 22 +++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/io.c b/src/io.c
index 30908e6..5c5ac64 100644
--- a/src/io.c
+++ b/src/io.c
@@ -11,6 +11,12 @@
 static int rows, linecount;	/* for paging */
 
 WINDOW *curwnd;
+WINDOW *fullscreen_window;
+WINDOW *srscan_window;
+WINDOW *report_window;
+WINDOW *lrscan_window;
+WINDOW *message_window;
+WINDOW *prompt_window;
 
 static void outro(void)
 /* wrap up, either normally or due to signal */
diff --git a/src/sst.h b/src/sst.h
index 838bc8a..396f6da 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -144,15 +144,8 @@ typedef struct {
 #define FDSPROB 8   // Move deep space probe
 #define NEVENTS (9)
 
-// Scalar variables that are needed for freezing the game
-// are placed in a structure. #defines are used to access by their
-// original names. Gee, I could have done this with the d structure,
-// but I just didn't think of it back when I started.
-
 #define SSTMAGIC	"SST2.0\n"
 
-extern WINDOW *curwnd;
-
 struct game {
     char magic[sizeof(SSTMAGIC)];
     unsigned long options;
@@ -403,12 +396,13 @@ void enqueue(char *);
 #define SCAN_STATUS		3
 #define SCAN_NO_LEFTSIDE	4
 
-WINDOW *fullscreen_window;
-WINDOW *srscan_window;
-WINDOW *report_window;
-WINDOW *lrscan_window;
-WINDOW *message_window;
-WINDOW *prompt_window;
+extern WINDOW *curwnd;
+extern WINDOW *fullscreen_window;
+extern WINDOW *srscan_window;
+extern WINDOW *report_window;
+extern WINDOW *lrscan_window;
+extern WINDOW *message_window;
+extern WINDOW *prompt_window;
 
 extern void clreol(void);
 extern void clrscr(void);
@@ -421,6 +415,4 @@ enum COLORS {
    DARKGRAY, LIGHTBLUE, LIGHTGREEN, LIGHTCYAN, LIGHTRED, LIGHTMAGENTA, YELLOW, WHITE
 };
 
-#define DAMAGED	128	/* marker for damaged ship in starmap */
-
 #endif
-- 
2.31.1