remove SYSFLAGS and MFLOPPY code

A check into github issue 364 confirmed that ba6edbe5dc had incorrectly updated the bwrite sizeof entry for sysflags. The SYSFLAGS and MFLOPPY code is all in the outdated part of the tree, so just remove it rather than re-correct it. Closes #364 Closes #207
2020-07-05 08:50:13 -04:00
parent 84bba3f099
commit 5a437b336a
25 changed files with 63 additions and 881 deletions
--- a/outdated/include/amiconf.h
+++ b/outdated/include/amiconf.h
@@ -0,0 +1,190 @@
+/* NetHack 3.6	amiconf.h	$NHDT-Date: 1432512775 2015/05/25 00:12:55 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
+/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1990, 1991, 1992, 1993.
+ */
+/* NetHack may be freely redistributed.  See license for details. */
+
+#ifndef AMICONF_H
+#define AMICONF_H
+
+#undef abs /* avoid using macro form of abs */
+#ifndef __SASC_60
+#undef min /* this gets redefined */
+#undef max /* this gets redefined */
+#endif
+
+#include <time.h> /* get time_t defined before use! */
+
+#ifdef __SASC_60    /* since SAS can prevent re-inclusion */
+#include <stdlib.h> /* general things, including builtins */
+#include <string.h>
+#endif
+
+#ifdef AZTEC_50
+#include <stdlib.h>
+#define AZTEC_C_WORKAROUND /* Bug which turns up in sounds.c. Bummer... */
+#define NO_SIGNAL          /* 5.0 signal handling doesn't like SIGINT... */
+#endif
+
+#ifdef _DCC
+#include <stdlib.h>
+#define _SIZE_T
+#endif
+
+#ifndef __GNUC__
+typedef long off_t;
+#endif
+
+#define MICRO /* must be defined to allow some inclusions */
+
+#define NOCWD_ASSUMPTIONS /* Allow paths to be specified for HACKDIR, \
+                             LEVELDIR, SAVEDIR, BONESDIR, DATADIR,    \
+                             SCOREDIR, LOCKDIR, CONFIGDIR, and TROUBLEDIR */
+
+/* data librarian defs */
+#ifndef NOCWD_ASSUMPTIONS
+#define DLBFILE "NetHack:nhdat"   /* main library */
+#define DLBFILE2 "NetHack:nhsdat" /* sound library */
+#else
+#define DLBFILE "nhdat"   /* main library */
+#define DLBFILE2 "nhsdat" /* sound library */
+#endif
+
+#define FILENAME_CMP stricmp /* case insensitive */
+
+#ifndef __SASC_60
+#define O_BINARY 0
+#endif
+
+/* Compile in New Intuition look for 2.0 */
+#ifdef IDCMP_CLOSEWINDOW
+#ifndef INTUI_NEW_LOOK
+#define INTUI_NEW_LOOK 1
+#endif
+#endif
+
+#define MFLOPPY /* You'll probably want this; provides assistance \
+                 * for typical personal computer configurations   \
+                 */
+#define RANDOM
+
+/* ### amidos.c ### */
+
+extern void FDECL(nethack_exit, (int));
+
+/* ### amiwbench.c ### */
+
+extern void NDECL(ami_wbench_init);
+extern void NDECL(ami_wbench_args);
+extern int FDECL(ami_wbench_getsave, (int));
+extern void FDECL(ami_wbench_unlink, (char *));
+extern int FDECL(ami_wbench_iconsize, (char *));
+extern void FDECL(ami_wbench_iconwrite, (char *));
+extern int FDECL(ami_wbench_badopt, (const char *));
+extern void NDECL(ami_wbench_cleanup);
+extern void FDECL(getlind, (const char *, char *, const char *));
+
+/* ### winreq.c ### */
+
+extern void amii_setpens(int);
+
+extern void FDECL(exit, (int));
+extern void NDECL(CleanUp);
+extern void FDECL(Abort, (long));
+extern int NDECL(getpid);
+extern char *FDECL(CopyFile, (const char *, const char *));
+extern int NDECL(kbhit);
+extern int NDECL(WindowGetchar);
+extern void FDECL(ami_argset, (int *, char *[]));
+extern void FDECL(ami_mkargline, (int *, char **[]));
+extern void FDECL(ami_wininit_data, (int));
+
+#define FromWBench 0 /* A hint for compiler ... */
+/* extern boolean FromWBench;	/* how were we run? */
+extern int ami_argc;
+extern char **ami_argv;
+
+#ifndef MICRO_H
+#include "micro.h"
+#endif
+
+#ifndef PCCONF_H
+#include "pcconf.h" /* remainder of stuff is almost same as the PC */
+#endif
+
+#define remove(x) unlink(x)
+
+/* DICE wants rewind() to return void.	We want it to return int. */
+#if defined(_DCC) || defined(__GNUC__)
+#define rewind(f) fseek(f, 0, 0)
+#endif
+
+#ifdef AZTEC_C
+extern FILE *FDECL(freopen, (const char *, const char *, FILE *));
+extern char *FDECL(gets, (char *));
+#endif
+
+#define msmsg printf
+
+/*
+ * If AZTEC_C  we can't use the long cpath in vision.c....
+ */
+#ifdef AZTEC_C
+#undef MACRO_CPATH
+#endif
+
+/*
+ *  (Possibly) configurable Amiga options:
+ */
+
+#define TEXTCOLOR /* Use colored monsters and objects */
+#define HACKFONT  /* Use special hack.font */
+#define SHELL     /* Have a shell escape command (!) */
+#define MAIL      /* Get mail at unexpected occasions */
+#define DEFAULT_ICON "NetHack:default.icon" /* private icon */
+#define AMIFLUSH /* toss typeahead (select flush in .cnf) */
+/* #define OPT_DISPMAP		/* enable fast_map option */
+
+/* new window system options */
+/* WRONG - AMIGA_INTUITION should go away */
+#ifdef AMII_GRAPHICS
+#define AMIGA_INTUITION /* high power graphics interface (amii) */
+#endif
+
+#define CHANGE_COLOR 1
+
+#ifdef TEXTCOLOR
+#define DEPTH 6 /* Maximum depth of the screen allowed */
+#else
+#define DEPTH 2 /* Four colors...sigh... */
+#endif
+
+#define AMII_MAXCOLORS (1L << DEPTH)
+typedef unsigned short AMII_COLOR_TYPE;
+
+#define PORT_HELP "nethack:amii.hlp"
+
+#undef TERMLIB
+
+#define AMII_MUFFLED_VOLUME 40
+#define AMII_SOFT_VOLUME 50
+#define AMII_OKAY_VOLUME 60
+#define AMII_LOUDER_VOLUME 80
+
+#ifdef TTY_GRAPHICS
+#define ANSI_DEFAULT
+#endif
+
+extern int amibbs; /* BBS mode? */
+
+#ifdef AMII_GRAPHICS
+extern int amii_numcolors;
+void FDECL(amii_setpens, (int));
+#endif
+
+/* for cmd.c: override version in micro.h */
+#ifdef __SASC_60
+#undef M
+#define M(c) ((c) -128)
+#endif
+
+#endif /* AMICONF_H */
--- a/outdated/include/os2conf.h
+++ b/outdated/include/os2conf.h
@@ -0,0 +1,105 @@
+/* NetHack 3.6	os2conf.h	$NHDT-Date: 1432512775 2015/05/25 00:12:55 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
+/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+/*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
+/* Copyright (c) Timo Hakulinen, 1990, 1991, 1992, 1993, 1996. */
+/* NetHack may be freely redistributed.  See license for details. */
+
+#ifdef OS2
+#ifndef OS2CONF_H
+#define OS2CONF_H
+
+/*
+ * Compiler configuration.  Compiler may be
+ * selected either here or in Makefile.os2.
+ */
+
+/* #define OS2_MSC		/* Microsoft C 5.1 and 6.0 */
+#define OS2_GCC /* GCC emx 0.8f */
+                /* #define OS2_CSET2		/* IBM C Set/2 (courtesy Jeff Urlwin) */
+                /* #define OS2_CSET2_VER_1	/* CSet/2 version selection */
+                /* #define OS2_CSET2_VER_2	/* - " - */
+
+/*
+ * System configuration.
+ */
+
+#define OS2_USESYSHEADERS /* use compiler's own system headers */
+/* #define OS2_HPFS		/* use OS/2 High Performance File System */
+
+#if defined(OS2_GCC) || defined(OS2_CSET2)
+#define OS2_32BITAPI /* enable for compilation in OS/2 2.0 */
+#endif
+
+/*
+ * Other configurable options.  Generally no
+ * reason to touch the defaults, I think.
+ */
+
+/*#define MFLOPPY			/* floppy and ramdisk support */
+#define RANDOM /* Berkeley random(3) */
+#define SHELL  /* shell escape */
+/* #define TERMLIB		/* use termcap file */
+#define ANSI_DEFAULT /* allows NetHack to run without termcap file */
+#define TEXTCOLOR    /* allow color */
+
+/*
+ * The remaining code shouldn't need modification.
+ */
+
+#ifdef MSDOS
+#undef MSDOS /* MSC autodefines this but we don't want it */
+#endif
+
+#ifndef MICRO
+#define MICRO /* must be defined to allow some inclusions */
+#endif
+
+#if !defined(TERMLIB) && !defined(ANSI_DEFAULT)
+#define ANSI_DEFAULT /* have to have one or the other */
+#endif
+
+#define PATHLEN 260  /* maximum pathlength (HPFS) */
+#define FILENAME 260 /* maximum filename length (HPFS) */
+#ifndef MICRO_H
+#include "micro.h" /* necessary externs for [os_name].c */
+#endif
+
+#ifndef SYSTEM_H
+#include "system.h"
+#endif
+
+#ifndef index
+#define index strchr
+#endif
+#ifndef rindex
+#define rindex strrchr
+#endif
+
+#include <time.h>
+
+/* the high quality random number routines */
+#ifndef USE_ISAAC64
+# ifdef RANDOM
+#  define Rand() random()
+# else
+#  define Rand() rand()
+# endif
+#endif
+
+/* file creation mask */
+
+#include <sys\types.h>
+#include <sys\stat.h>
+
+#define FCMASK (S_IREAD | S_IWRITE)
+
+#include <fcntl.h>
+
+#ifdef __EMX__
+#include <unistd.h>
+#define sethanguphandler(foo) (void) signal(SIGHUP, (SIG_RET_TYPE) foo)
+#endif
+
+void hangup(int i);
+#endif /* OS2CONF_H */
+#endif /* OS2 */
--- a/outdated/include/tosconf.h
+++ b/outdated/include/tosconf.h
@@ -0,0 +1,83 @@
+/* NetHack 3.6	tosconf.h	$NHDT-Date: 1432512782 2015/05/25 00:13:02 $  $NHDT-Branch: master $:$NHDT-Revision: 1.7 $ */
+/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+/*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
+/* NetHack may be freely redistributed.  See license for details. */
+
+#ifdef TOS
+#ifndef TOSCONF_H
+#define TOSCONF_H
+
+#define MICRO /* must be defined to allow some inclusions */
+
+/*
+   Adjust these options to suit your compiler. The default here is for
+   GNU C with the MiNT library.
+*/
+
+/*#define NO_SIGNAL		/* library doesn't support signals	*/
+/*#define NO_FSTAT		/* library doesn't have fstat() call	*/
+#define MINT /* library supports MiNT extensions to TOS */
+
+#ifdef __MINT__
+#define MINT
+#endif
+
+#ifdef O_BINARY
+#define FCMASK O_BINARY
+#else
+#define FCMASK 0660
+#define O_BINARY 0
+#endif
+
+#ifdef UNIXDEBUG
+#define remove(x) unlink(x)
+#endif
+
+/* configurable options */
+#define MFLOPPY   /* floppy support		*/
+#define RANDOM    /* improved random numbers	*/
+#define SHELL     /* allow spawning of shell	*/
+#define TERMLIB   /* use termcap			*/
+#define TEXTCOLOR /* allow color			*/
+#define MAIL      /* enable the fake maildemon */
+#ifdef MINT
+#define SUSPEND /* allow suspending the game	*/
+#endif
+
+#ifndef TERMLIB
+#define ANSI_DEFAULT /* use vt52 by default		*/
+#endif
+
+#if defined(__GNUC__) || defined(__MINT__)
+/* actually, only more recent GNU C libraries have strcmpi
+ * on the other hand, they're free -- if yours is out of
+ * date, grab the most recent from atari.archive.umich.edu
+ */
+#define STRNCMPI
+#undef strcmpi
+extern int FDECL(strcmpi, (const char *, const char *));
+extern int FDECL(strncmpi, (const char *, const char *, size_t));
+#endif
+
+#include <termcap.h>
+#include <unistd.h>
+/* instead of including system.h from pcconf.h */
+#include <string.h>
+#include <stdlib.h>
+#include <types.h>
+#define SIG_RET_TYPE __Sigfunc
+#define SYSTEM_H
+
+#ifndef MICRO_H
+#include "micro.h"
+#endif
+#ifndef PCCONF_H
+#include "pcconf.h" /* remainder of stuff is same as the PC */
+#endif
+
+#ifdef TEXTCOLOR
+extern boolean colors_changed; /* in tos.c */
+#endif
+
+#endif /* TOSCONF_H */
+#endif /* TOS */