Revert structurization changes, they broke database compilation...

...bug showing only if adventure.data was absent.  We'll need to sneak up
on this more carefully.
This commit is contained in:
Eric S. Raymond 2017-05-24 00:17:19 -04:00
parent 7e5448e974
commit 484ca4e9fd
11 changed files with 485 additions and 533 deletions

50
main.h
View file

@ -2,57 +2,9 @@
#define LINESIZE 100
extern long ABB[], ATAB[], ATLOC[], DLOC[], FIXED[],
extern long ABB[], ATAB[], ATLOC[], BLKLIN, DFLAG, DLOC[], FIXED[], HOLDNG,
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;
long setup;
long spk;
long tally;
long thresh;
long trndex;
long trnluz;
long turns;
/* more state will go here */
long wzdark;
long zzword;
/* more state will go here */
long clshint;
long novice;
/* more state will go here */
long dseen[7];
};
extern struct game_t game;