Various declaration cleanups.

diff --git a/src/io.c b/src/io.c
index 30908e63fee269a2a8803f45908748a07bee5fd1..5c5ac644526dc4c91ba5f9db6be3e20b04fab22f 100644 (file)
--- a/src/io.c
+++ b/src/io.c
@@ -11,6 +11,12 @@
 static int rows, linecount;    /* for paging */
 
 WINDOW *curwnd;
 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 */
 
 static void outro(void)
 /* wrap up, either normally or due to signal */

diff --git a/src/sst.h b/src/sst.h
index 838bc8ae829f4a527aa25f4f983ce23318b38b4d..396f6dabdf054f91f8d823bf8d8d31a7eaaf3bb0 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -144,15 +144,8 @@ typedef struct {
 #define FDSPROB 8   // Move deep space probe
 #define NEVENTS (9)
 
 #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"
 
 #define SSTMAGIC       "SST2.0\n"
 

-extern WINDOW *curwnd;
-

 struct game {
     char magic[sizeof(SSTMAGIC)];
     unsigned long options;
 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
 
 #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);
 
 extern void clreol(void);
 extern void clrscr(void);


@@ -421,6 +415,4 @@ enum COLORS {
    DARKGRAY, LIGHTBLUE, LIGHTGREEN, LIGHTCYAN, LIGHTRED, LIGHTMAGENTA, YELLOW, WHITE
 };
 
    DARKGRAY, LIGHTBLUE, LIGHTGREEN, LIGHTCYAN, LIGHTRED, LIGHTMAGENTA, YELLOW, WHITE
 };
 

-#define DAMAGED        128     /* marker for damaged ship in starmap */
-

 #endif
 #endif