flag adjustments (trunk only)

Move all system or port specific flags to sysflags which is used only if
SYSFLAGS is defined, and leave everything else in flags unconditional.

include/flag.h

@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)flag.h	3.4	2002/08/22	*/
+/*	SCCS Id: @(#)flag.h	3.4	2003/11/09	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -16,55 +16,34 @@
 
 struct flag {
 	boolean  acoustics;	/* allow dungeon sound messages */
-#ifdef AMIFLUSH
-	boolean  altmeta;	/* use ALT keys as META */
-	boolean  amiflush;	/* kill typeahead */
-#endif
-#ifdef	MFLOPPY
-	boolean  asksavedisk;
-#endif
 	boolean  autodig;       /* MRKR: Automatically dig */
 	boolean  autoquiver;	/* Automatically fill quiver */
 	boolean  beginner;
-#ifdef MAIL
 	boolean  biff;		/* enable checking for mail */
-#endif
 	boolean  confirm;	/* confirm before hitting tame monsters */
 	boolean  debug;		/* in debugging mode */
 #define wizard	 flags.debug
 	boolean  end_own;	/* list all own scores */
 	boolean  explore;	/* in exploration mode */
-#ifdef OPT_DISPMAP
-	boolean  fast_map;	/* use optimized, less flexible map display */
-#endif
 #define discover flags.explore
 	boolean  female;
  	boolean  friday13;	/* it's Friday the 13th */
 	boolean  help;		/* look in data file for info about stuff */
 	boolean  ignintr;	/* ignore interrupts */
-#ifdef INSURANCE
-	boolean  ins_chkpt;	/* checkpoint as appropriate */
-#endif
+	boolean  ins_chkpt;	/* checkpoint as appropriate; INSURANCE */
 	boolean  invlet_constant; /* let objects keep their inventory symbol */
 	boolean  legacy;	/* print game entry "story" */
 	boolean  lit_corridor;	/* show a dark corr as lit if it is in sight */
 	boolean  nap;		/* `timed_delay' option for display effects */
 	boolean  null;		/* OK to send nulls to the terminal */
-#ifdef MAC
-	boolean  page_wait;	/* put up a --More-- after a page of messages */
-#endif
 	boolean  perm_invent;	/* keep full inventories up until dismissed */
 	boolean  pickup;	/* whether you pickup or move and look */
 
 	boolean  pushweapon;	/* When wielding, push old weapon into second slot */
 	boolean  rest_on_space; /* space means rest */
 	boolean  safe_dog;	/* give complete protection to the dog */
-#ifdef EXP_ON_BOTL
 	boolean  showexp;	/* show experience points */
-#endif
-#ifdef SCORE_ON_BOTL
 	boolean  showscore;	/* show score */
-#endif
 	boolean  silent;	/* whether the bell rings or not */
 	boolean  sortpack;	/* sorted inventory */
 	boolean  sparkle;	/* show "resisting" special FX (Scott Bigham) */
@@ -90,11 +69,6 @@ struct flag {
 	char	 end_disclose[NUM_DISCLOSURE_OPTIONS + 1];  /* disclose various info
 								upon exit */
 	char	 menu_style;	/* User interface style setting */
-#ifdef AMII_GRAPHICS
-	int numcols;
-	unsigned short amii_dripens[ 20 ]; /* DrawInfo Pens currently there are 13 in v39 */
-	AMII_COLOR_TYPE amii_curmap[ AMII_MAXCOLORS ]; /* colormap */
-#endif
 
 	/* KMH, role patch -- Variables used during startup.
 	 *
@@ -135,6 +109,42 @@ struct flag {
 	int	 runmode;	/* update screen display during run moves */
 };
 
+/*
+ * System-specific flags that are saved with the game if SYSFLAGS is defined.
+ */
+
+#if defined(AMIFLUSH) || defined(AMII_GRAPHICS) || defined(OPT_DISPMAP)
+#define SYSFLAGS
+#else
+#if defined(MFLOPPY) || defined(MAC)
+#define SYSFLAGS
+#endif
+#endif
+
+#ifdef SYSFLAGS
+struct sysflag {
+	char sysflagsid[10];
+#ifdef AMIFLUSH
+	boolean  altmeta;	/* use ALT keys as META */
+	boolean  amiflush;	/* kill typeahead */
+#endif
+#ifdef AMII_GRAPHICS
+	int numcols;
+	unsigned short amii_dripens[ 20 ]; /* DrawInfo Pens currently there are 13 in v39 */
+	AMII_COLOR_TYPE amii_curmap[ AMII_MAXCOLORS ]; /* colormap */
+#endif
+#ifdef OPT_DISPMAP
+	boolean  fast_map;	/* use optimized, less flexible map display */
+#endif
+#ifdef	MFLOPPY
+	boolean  asksavedisk;
+#endif
+#ifdef MAC
+	boolean  page_wait;	/* put up a --More-- after a page of messages */
+#endif
+};
+#endif
+
 /*
  * Flags that are set each time the game is started.
  * These are not saved with the game.
@@ -279,6 +289,9 @@ struct instance_flags {
 #define preload_tiles wc_preload_tiles
 
 extern NEARDATA struct flag flags;
+#ifdef SYSFLAGS
+extern NEARDATA struct sysflag sysflags;
+#endif
 extern NEARDATA struct instance_flags iflags;
 
 /* runmode options */