remove some macgraphics references; some Amiga

Also closes #183

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index cb580d34f7ad29c878959bbd48236be9d6f5243f..f88ab73f29aee9dd3d128e7a1fd44d1fbb68f502 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1832,9 +1832,6 @@ the first letter of the command.
 .pg
 On \fIWindows\fP and \fIMS-DOS\fP,
 the \(lqAlt\(rq key can be used in this fashion.
-.\" On the \fIAmiga\fP, set the
-.\" .op altmeta
-.\" option to get this behavior.
 On other systems, if typing \(lqAlt\(rq plus another key transmits a
 two character sequence consisting of an \fBEscape\fP
 followed by the other key, you may set the
@@ -4842,11 +4839,7 @@ to customize and change the port behavior.
 Select an alternate way to handle keystrokes (Win32 tty NetHack only).
 The name of the handling type is one of \(lqdefault\(rq, \(lqray\(rq,
 \(lq340\(rq.
-.\" .lp "altmeta "
-.\" On Amiga, this option controls whether typing \(lqAlt\(rq plus another key
-.\" functions as a meta-shift for that key (default on).
 .lp "altmeta "
-.\" On other (non-Amiga) systems where this option is available, it can be
 On systems where this option is available, it can be
 set to tell NetHack to convert a two character sequence beginning with
 ESC into a meta-shifted version of the second character (default off).
@@ -4866,12 +4859,6 @@ Use BIOS calls to update the screen
 display quickly and to read the keyboard (allowing the use of arrow
 keys to move) on machines with an IBM PC compatible BIOS ROM (default off,
 OS/2, PC, and ST NetHack only).
-.lp flush
-(default off, Amiga NetHack only).
-.lp MACgraphics
-(default on, Mac NetHack only).
-.lp page_wait
-(default on, Mac NetHack only).
 .lp "rawio   "
 Force raw (non-cbreak) mode for faster output and more
 bulletproof input (MS-DOS sometimes treats \(oq\(haP\(cq as a printer toggle
@@ -6289,7 +6276,7 @@ various
 flavors and maintained the X11 interface.
 .pg
 \fBKen Lorber\fP, \fBHaoyang Wang\fP, \fBPat Rankin\fP, and \fBDean Luick\fP
-maintained the port of NetHack 3.6 for Mac OSX.
+maintained the port of NetHack 3.6 for MacOS.
 .pg
 \fBMichael Allison\fP, \fBDavid Cohrs\fP, \fBBart House\fP,
 \fBPasi Kallinen\fP, \fBAlex Kompel\fP, \fBDion Nicolaas\fP,

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index f2ff0920ac08efab905fdf6af5bf95ead4b9ae29..b53fc13536bc4cb83898749504c9c807490d49b8 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -1980,7 +1980,6 @@ letter of the command.
 
 On {\it Windows\/} and {\it MS-DOS\/},
 the `Alt' key can be used in this fashion.
-%% On the {\it Amiga}, set the {\it altmeta\/} option to get this behavior.
 On other systems, if typing `Alt' plus another key transmits a
 two character sequence consisting of an {\tt Escape}
 followed by the other key, you may set the {\it altmeta\/}
@@ -5366,15 +5365,6 @@ Use BIOS calls to update the screen display quickly and to read the keyboard
 (allowing the use of arrow keys to move) on machines with an IBM PC
 compatible BIOS ROM (default off, {\it OS/2, PC\/ {\rm and} ST NetHack\/} only).
 %.lp
-\item[\ib{flush}]
-(default off, {\it Amiga NetHack \/} only).
-%.lp
-\item[\ib{Macgraphics}]
-(default on, {\it Mac NetHack \/} only).
-%.lp
-\item[\ib{page\verb+_+wait}]
-(default off, {\it Mac NetHack \/} only).
-%.lp
 \item[\ib{rawio}]
 Force raw (non-cbreak) mode for faster output and more
 bulletproof input (MS-DOS sometimes treats `{\tt \^{}P}' as a printer toggle
@@ -6982,7 +6972,7 @@ operate on various UNIX flavors and maintained the X11 interface.
 %.pg
 \medskip
 {\it Ken Lorber}, {\it Haoyang Wang}, {\it Pat Rankin}, and {\it Dean Luick}
-maintained the port of {\it NetHack\/} 3.6 for Mac OSX.
+maintained the port of {\it NetHack\/} 3.6 for MacOS.
 
 %.pg
 \medskip

diff --git a/include/flag.h b/include/flag.h
index 9cf67e4c071a9964e11c6504bb68d89426d0cbfa..e78a2183476b1547a0d5a57307d9a6e4e6deb430 100644 (file)
--- a/include/flag.h
+++ b/include/flag.h
@@ -293,11 +293,6 @@ struct instance_flags {
 #if defined(MICRO) || defined(WIN32)
     boolean rawio; /* whether can use rawio (IOCTL call) */
 #endif
-#ifdef MAC_GRAPHICS_ENV
-    boolean MACgraphics; /* use Macintosh extended character set, as
-                            as defined in the special font HackFont */
-    unsigned use_stone;  /* use the stone ppats */
-#endif
 #if defined(MSDOS) || defined(WIN32)
     boolean tile_view;
     boolean over_view;

diff --git a/include/optlist.h b/include/optlist.h
index ca9a01b6498bd1875232fc2e501c9bb2bdd62f9c..ab833e0dacea09a695fb83585e79a830bf04f750 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -334,11 +334,6 @@ static int optfn_##a(int, int, boolean, char *, char *);
                 Off, Yes, No, No, NoAlias, &flags.lit_corridor, Term_False)
     NHOPTB(lootabc, Advanced, 0, opt_in, set_in_game,
                 Off, Yes, No, No, NoAlias, &flags.lootabc, Term_False)
-#if defined(BACKWARD_COMPAT) && defined(MAC_GRAPHICS_ENV)
-    NHOPTC(Macgraphics, Advanced, 70, opt_in, set_in_config,
-                No, Yes, No, No, NoAlias,
-                "load MACGraphics display symbols into symset")
-#endif
     NHOPTB(mail, Advanced, 0, opt_out, set_in_game,
                 On, Yes, No, No, NoAlias, &flags.biff, Term_False)
     NHOPTC(map_mode, Advanced, 20, opt_in, set_gameview,

diff --git a/src/mdlib.c b/src/mdlib.c
index 0afae3b0736f132657d84dfe390afde66334d03f..2ab754ebca6298cc4a042fc0873f677b41be73fd 100644 (file)
--- a/src/mdlib.c
+++ b/src/mdlib.c
@@ -116,7 +116,7 @@ static struct win_information window_opts[] = {
 #ifdef MSDOS
       "traditional text with optional 'tiles' graphics",
 #else
-      /* assume that one or more of IBMgraphics, DECgraphics, or MACgraphics
+      /* assume that one or more of IBMgraphics, DECgraphics
          can be enabled; we can't tell from here whether that is accurate */
       "traditional text with optional line-drawing",
 #endif

diff --git a/src/options.c b/src/options.c
index 9da46b25146cd379dbbc74f03760a5e059de805e..e86ba433fa099c509318bebc9d07a3025e308356 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1808,49 +1808,6 @@ optfn_IBMgraphics(int optidx, int req, boolean negated,
     return optn_ok;
 }
 
-#if defined(BACKWARD_COMPAT) && defined(MAC_GRAPHICS_ENV)
-static int
-optfn_MACgraphics(int optidx, int req, boolean negated, char *opts, char *op)
-{
-    boolean badflag = FALSE;
-
-    if (req == do_init) {
-        return optn_ok;
-    }
-    if (req == do_set) {
-        /* "MACgraphics" */
-        if (!negated) {
-            if (gs.symset[PRIMARYSET].name) {
-                badflag = TRUE;
-            } else {
-                gs.symset[PRIMARYSET].name = dupstr(allopt[optidx].name);
-                if (!read_sym_file(PRIMARYSET)) {
-                    badflag = TRUE;
-                    clear_symsetentry(PRIMARYSET, TRUE);
-                }
-            }
-            if (badflag) {
-                config_error_add("Failure to load symbol set %s.",
-                                 allopt[optidx].name);
-                return FALSE;
-            } else {
-                switch_symbols(TRUE);
-                if (!go.opt_initial && Is_rogue_level(&u.uz))
-                    assign_graphics(ROGUESET);
-            }
-        }
-        return optn_ok;
-    }
-    if (req == get_val || req == get_cnf_val) {
-        if (!opts)
-            return optn_err;
-        opts[0] = '\0';
-        return optn_ok;
-    }
-    return optn_ok;
-}
-#endif /* BACKWARD_COMPAT && MAC_GRAPHICS_ENV */
-
 static int
 optfn_map_mode(int optidx, int req, boolean negated, char *opts, char *op)
 {