Move more globals into the state structure.

[open-adventure.git] / main.h

diff --git a/main.h b/main.h
index fa87d627ec8847e720f844ca471bcd41cea47872..0e4feb091ced7d4f4981abbb9f23f24756886a0a 100644 (file)
--- a/main.h
+++ b/main.h
@@ -2,9 +2,46 @@
 
 #define LINESIZE       100
 
-extern long ABB[], ATAB[], ATLOC[], BLKLIN, DFLAG, DLOC[], FIXED[], HOLDNG,
+extern long ABB[], ATAB[], ATLOC[], DLOC[], FIXED[],
                KTAB[], *LINES, LINK[], LNLENG, LNPOSN,
                PARMS[], PLACE[], PTEXT[], RTEXT[], TABSIZ;
 extern signed char INLINE[LINESIZE+1], MAP1[], MAP2[];
 extern FILE *logfp;
 extern bool oldstyle;
+
+struct game_t  {
+    /* These members are in the save order of the individual variables
+     * in the 2.5 code. */
+    long abbnum;
+    long blklin;
+    long bonus;
+    long clock1;
+    long clock2;
+    long closed;
+    long closng;
+    long detail;
+    long dflag;
+    long dkill;
+    long dtotal;
+    long foobar;
+    long holdng;
+    long iwest;
+    long knfloc;
+    long limit;
+    /* LL may go here */
+    long lmwarn;
+    /* LOC will go here */
+    long newloc;
+    /* OBJ will go here */
+    long numdie;
+    long oldlc2;
+    long oldloc;
+    long oldobj;
+    long panic;
+    long saved;
+    /* more state will go here */
+    long wzdark;
+    /* more state will go here */
+    long novice;
+};
+extern struct game_t game;