Reformat .h files.
I did my best to exempt some of the bigger aligned blocks from the reformatting using the /* clang-format off */ and /* clang-format on */ tags. Probably some that shouldn't have been formatted were anyway; if you encounter them, please fix. The clang-format tags were left in on the basis that it's much easier to prune those out later than to put them back in, and it means that, modulo my custom version of clang-format, I should be able to run clang-format on the source tree again without changing anything, now that Pat has fixed the VA_DECL issues.
This commit is contained in:
Sean Hunt
331
include/pcconf.h
331
include/pcconf.h
@@ -7,9 +7,9 @@
|
||||
#ifndef PCCONF_H
|
||||
#define PCCONF_H
|
||||
|
||||
#define MICRO /* always define this! */
|
||||
#define MICRO /* always define this! */
|
||||
|
||||
#ifdef MSDOS /* some of this material is MS-DOS specific */
|
||||
#ifdef MSDOS /* some of this material is MS-DOS specific */
|
||||
|
||||
/*
|
||||
* Automatic Defines:
|
||||
@@ -31,17 +31,17 @@
|
||||
* For pre-V7.0 Microsoft Compilers only, manually define OVERLAY here.
|
||||
*/
|
||||
|
||||
/*#define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */
|
||||
/*#define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */
|
||||
|
||||
# ifndef __GO32__
|
||||
#define MFLOPPY /* Support for floppy drives and ramdisks by dgk */
|
||||
# endif
|
||||
#ifndef __GO32__
|
||||
#define MFLOPPY /* Support for floppy drives and ramdisks by dgk */
|
||||
#endif
|
||||
|
||||
# define SHELL /* via exec of COMMAND.COM */
|
||||
#define SHELL /* via exec of COMMAND.COM */
|
||||
|
||||
# ifdef __BORLANDC__
|
||||
#define PCMUSIC /* Music option, enable very basic pc speaker music notes */
|
||||
# endif
|
||||
#ifdef __BORLANDC__
|
||||
#define PCMUSIC /* Music option, enable very basic pc speaker music notes */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Screen control options
|
||||
@@ -53,25 +53,23 @@
|
||||
* or NO_TERMS
|
||||
*/
|
||||
|
||||
/* # define TERMLIB */ /* enable use of termcap file /etc/termcap */
|
||||
/* or ./termcap for MSDOS (SAC) */
|
||||
/* compile and link in Fred Fish's termcap library, */
|
||||
/* enclosed in TERMCAP.ARC, to use this */
|
||||
/* # define TERMLIB */ /* enable use of termcap file /etc/termcap */
|
||||
/* or ./termcap for MSDOS (SAC) */
|
||||
/* compile and link in Fred Fish's termcap library, */
|
||||
/* enclosed in TERMCAP.ARC, to use this */
|
||||
|
||||
/* # define ANSI_DEFAULT */ /* allows NetHack to run without a ./termcap */
|
||||
/* # define ANSI_DEFAULT */ /* allows NetHack to run without a ./termcap */
|
||||
|
||||
# define NO_TERMS /* Allows Nethack to run without ansi.sys by linking */
|
||||
/* screen routines into the .exe */
|
||||
#define NO_TERMS /* Allows Nethack to run without ansi.sys by linking */
|
||||
/* screen routines into the .exe */
|
||||
|
||||
# ifdef NO_TERMS /* if NO_TERMS select one screen package below */
|
||||
#define SCREEN_BIOS /* Use bios calls for all screen control */
|
||||
/* #define SCREEN_DJGPPFAST */ /* Use djgpp fast screen routines */
|
||||
# endif
|
||||
|
||||
|
||||
/* # define PC9800 */ /* Allows NetHack to run on NEC PC-9800 machines */
|
||||
/* Yamamoto Keizo */
|
||||
#ifdef NO_TERMS /* if NO_TERMS select one screen package below */
|
||||
#define SCREEN_BIOS /* Use bios calls for all screen control */
|
||||
/* #define SCREEN_DJGPPFAST */ /* Use djgpp fast screen routines */
|
||||
#endif
|
||||
|
||||
/* # define PC9800 */ /* Allows NetHack to run on NEC PC-9800 machines */
|
||||
/* Yamamoto Keizo */
|
||||
|
||||
/*
|
||||
* PC video hardware support options (for graphical tile support)
|
||||
@@ -79,32 +77,32 @@
|
||||
* You may uncomment any/all of the options below.
|
||||
*
|
||||
*/
|
||||
# ifndef SUPPRESS_GRAPHICS
|
||||
# if (defined(SCREEN_BIOS) || defined(SCREEN_DJGPPFAST)) && !defined(PC9800)
|
||||
# ifdef USE_TILES
|
||||
#define SCREEN_VGA /* Include VGA graphics routines in the build */
|
||||
# endif
|
||||
# endif
|
||||
# else
|
||||
# undef NO_TERMS
|
||||
# undef SCREEN_BIOS
|
||||
# undef SCREEN_DJGPPFAST
|
||||
# undef SCREEN_VGA
|
||||
# undef TERMLIB
|
||||
# define ANSI_DEFAULT
|
||||
# endif
|
||||
#ifndef SUPPRESS_GRAPHICS
|
||||
#if (defined(SCREEN_BIOS) || defined(SCREEN_DJGPPFAST)) && !defined(PC9800)
|
||||
#ifdef USE_TILES
|
||||
#define SCREEN_VGA /* Include VGA graphics routines in the build */
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#undef NO_TERMS
|
||||
#undef SCREEN_BIOS
|
||||
#undef SCREEN_DJGPPFAST
|
||||
#undef SCREEN_VGA
|
||||
#undef TERMLIB
|
||||
#define ANSI_DEFAULT
|
||||
#endif
|
||||
|
||||
# define RANDOM /* have Berkeley random(3) */
|
||||
#define RANDOM /* have Berkeley random(3) */
|
||||
|
||||
# define MAIL /* Allows for fake mail daemon to deliver mail */
|
||||
/* in the MSDOS version. (For AMIGA MAIL see */
|
||||
/* amiconf.h). In the future this will be the */
|
||||
/* hook for mail reader implementation. */
|
||||
#define MAIL /* Allows for fake mail daemon to deliver mail */
|
||||
/* in the MSDOS version. (For AMIGA MAIL see */
|
||||
/* amiconf.h). In the future this will be the */
|
||||
/* hook for mail reader implementation. */
|
||||
|
||||
/* The following is needed for prototypes of certain functions */
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__SC__)
|
||||
#include <process.h> /* Provides prototypes of exit(), spawn() */
|
||||
#include <process.h> /* Provides prototypes of exit(), spawn() */
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 7)
|
||||
@@ -113,28 +111,28 @@
|
||||
#ifdef strcmpi
|
||||
#undef strcmpi
|
||||
#endif
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#include <conio.h>
|
||||
#include <io.h>
|
||||
#include <direct.h>
|
||||
# define SIG_RET_TYPE void (__cdecl *)(int)
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
#define vprintf printf
|
||||
#define vfprintf fprintf
|
||||
#define vsprintf sprintf
|
||||
#define SIG_RET_TYPE void(__cdecl *)(int)
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
#define vprintf printf
|
||||
#define vfprintf fprintf
|
||||
#define vsprintf sprintf
|
||||
#endif
|
||||
|
||||
#if defined(__BORLANDC__) && defined(STRNCMPI)
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#endif
|
||||
|
||||
#if defined(__DJGPP__)
|
||||
#define _NAIVE_DOS_REGS
|
||||
#include <stdlib.h>
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
# ifndef M
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
# endif
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#ifndef M
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -152,32 +150,32 @@
|
||||
* simply a flag to turn on or off napping for visual effects at run-time.
|
||||
*/
|
||||
|
||||
#define TIMED_DELAY /* enable the `timed_delay' run-time option */
|
||||
#define TIMED_DELAY /* enable the `timed_delay' run-time option */
|
||||
|
||||
# ifdef PCMUSIC
|
||||
#define TIMED_DELAY /* need it anyway */
|
||||
# endif
|
||||
#define NOCWD_ASSUMPTIONS /* Allow paths to be specified for HACKDIR,
|
||||
LEVELDIR, SAVEDIR, BONESDIR, DATADIR,
|
||||
SCOREDIR, LOCKDIR, CONFIGDIR, and TROUBLEDIR. */
|
||||
#ifdef PCMUSIC
|
||||
#define TIMED_DELAY /* need it anyway */
|
||||
#endif
|
||||
#define NOCWD_ASSUMPTIONS /* Allow paths to be specified for HACKDIR, \
|
||||
LEVELDIR, SAVEDIR, BONESDIR, DATADIR, \
|
||||
SCOREDIR, LOCKDIR, CONFIGDIR, and TROUBLEDIR. \
|
||||
*/
|
||||
|
||||
#endif /* MSDOS configuration stuff */
|
||||
|
||||
#define PATHLEN 64 /* maximum pathlength */
|
||||
#define FILENAME 80 /* maximum filename length (conservative) */
|
||||
#define PATHLEN 64 /* maximum pathlength */
|
||||
#define FILENAME 80 /* maximum filename length (conservative) */
|
||||
#ifndef MICRO_H
|
||||
#include "micro.h" /* contains necessary externs for [os_name].c */
|
||||
#include "micro.h" /* contains necessary externs for [os_name].c */
|
||||
#endif
|
||||
|
||||
|
||||
/* ===================================================
|
||||
* The remaining code shouldn't need modification.
|
||||
*/
|
||||
|
||||
#ifndef SYSTEM_H
|
||||
# if !defined(_MSC_VER)
|
||||
#if !defined(_MSC_VER)
|
||||
#include "system.h"
|
||||
# endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __DJGPP__
|
||||
@@ -189,47 +187,48 @@
|
||||
#include <pc.h> /* kbhit() */
|
||||
#define PC_LOCKING
|
||||
#define HOLD_LOCKFILE_OPEN
|
||||
#define SELF_RECOVER /* NetHack itself can recover games */
|
||||
#define SELF_RECOVER /* NetHack itself can recover games */
|
||||
#endif
|
||||
|
||||
# ifdef MSDOS
|
||||
# ifndef EXEPATH
|
||||
#define EXEPATH /* HACKDIR is .exe location if not explicitly defined */
|
||||
# endif
|
||||
# endif
|
||||
#ifdef MSDOS
|
||||
#ifndef EXEPATH
|
||||
#define EXEPATH /* HACKDIR is .exe location if not explicitly defined */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# if defined(_MSC_VER) && defined(MSDOS)
|
||||
# if (_MSC_VER >= 700) && !defined(FUNCTION_LEVEL_LINKING)
|
||||
# ifndef MOVERLAY
|
||||
#define MOVERLAY /* Microsoft's MOVE overlay system (MSC >= 7.0) */
|
||||
# endif
|
||||
# endif
|
||||
#if defined(_MSC_VER) && defined(MSDOS)
|
||||
#if (_MSC_VER >= 700) && !defined(FUNCTION_LEVEL_LINKING)
|
||||
#ifndef MOVERLAY
|
||||
#define MOVERLAY /* Microsoft's MOVE overlay system (MSC >= 7.0) */
|
||||
#endif
|
||||
#endif
|
||||
#define PC_LOCKING
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Borland Stuff */
|
||||
# if defined(__BORLANDC__)
|
||||
# if defined(__OVERLAY__) && !defined(VROOMM)
|
||||
/* __OVERLAY__ is automatically defined by Borland C if overlay option is on */
|
||||
#define VROOMM /* Borland's VROOMM overlay system */
|
||||
# endif
|
||||
# if !defined(STKSIZ)
|
||||
#define STKSIZ 5*1024 /* Use a default of 5K stack for Borland C */
|
||||
/* This macro is used in any file that contains */
|
||||
/* a main() function. */
|
||||
# endif
|
||||
#if defined(__BORLANDC__)
|
||||
#if defined(__OVERLAY__) && !defined(VROOMM)
|
||||
/* __OVERLAY__ is automatically defined by Borland C if overlay option is on
|
||||
*/
|
||||
#define VROOMM /* Borland's VROOMM overlay system */
|
||||
#endif
|
||||
#if !defined(STKSIZ)
|
||||
#define STKSIZ 5 * 1024 /* Use a default of 5K stack for Borland C */
|
||||
/* This macro is used in any file that contains */
|
||||
/* a main() function. */
|
||||
#endif
|
||||
#define PC_LOCKING
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef PC_LOCKING
|
||||
#define HLOCK "NHPERM"
|
||||
#endif
|
||||
|
||||
#ifndef index
|
||||
# define index strchr
|
||||
#define index strchr
|
||||
#endif
|
||||
#ifndef rindex
|
||||
# define rindex strrchr
|
||||
#define rindex strrchr
|
||||
#endif
|
||||
|
||||
#ifndef AMIGA
|
||||
@@ -238,116 +237,118 @@
|
||||
|
||||
#ifdef RANDOM
|
||||
/* Use the high quality random number routines. */
|
||||
# define Rand() random()
|
||||
#define Rand() random()
|
||||
#else
|
||||
# define Rand() rand()
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
|
||||
#ifndef TOS
|
||||
# define FCMASK 0660 /* file creation mask */
|
||||
#define FCMASK 0660 /* file creation mask */
|
||||
#endif
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
#ifdef MSDOS
|
||||
# define TEXTCOLOR /* */
|
||||
# define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */
|
||||
#define TEXTCOLOR /* */
|
||||
#define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */
|
||||
#endif
|
||||
|
||||
|
||||
/* Sanity check, do not modify these blocks. */
|
||||
|
||||
/* OVERLAY must be defined with MOVERLAY or VROOMM */
|
||||
#if (defined(MOVERLAY) || defined(VROOMM))
|
||||
# ifndef OVERLAY
|
||||
# define OVERLAY
|
||||
# endif
|
||||
#ifndef OVERLAY
|
||||
#define OVERLAY
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(FUNCTION_LEVEL_LINKING)
|
||||
#define OVERLAY
|
||||
#endif
|
||||
|
||||
#if defined(OVERLAY) && !defined(MOVERLAY) && !defined(VROOMM) && !defined(FUNCTION_LEVEL_LINKING)
|
||||
#if defined(OVERLAY) && !defined(MOVERLAY) && !defined(VROOMM) \
|
||||
&& !defined(FUNCTION_LEVEL_LINKING)
|
||||
#define USE_TRAMPOLI
|
||||
#endif
|
||||
|
||||
#if defined(MSDOS) && defined(NO_TERMS)
|
||||
# ifdef TERMLIB
|
||||
# if defined(_MSC_VER) || defined(__SC__)
|
||||
# pragma message("Warning -- TERMLIB defined with NO_TERMS in pcconf.h")
|
||||
# pragma message(" Forcing undef of TERMLIB")
|
||||
# endif
|
||||
#ifdef TERMLIB
|
||||
#if defined(_MSC_VER) || defined(__SC__)
|
||||
#pragma message("Warning -- TERMLIB defined with NO_TERMS in pcconf.h")
|
||||
#pragma message(" Forcing undef of TERMLIB")
|
||||
#endif
|
||||
#undef TERMLIB
|
||||
# endif
|
||||
# ifdef ANSI_DEFAULT
|
||||
# if defined(_MSC_VER) || defined(__SC__)
|
||||
# pragma message("Warning -- ANSI_DEFAULT defined with NO_TERMS in pcconf.h")
|
||||
# pragma message(" Forcing undef of ANSI_DEFAULT")
|
||||
# endif
|
||||
#endif
|
||||
#ifdef ANSI_DEFAULT
|
||||
#if defined(_MSC_VER) || defined(__SC__)
|
||||
#pragma message("Warning -- ANSI_DEFAULT defined with NO_TERMS in pcconf.h")
|
||||
#pragma message(" Forcing undef of ANSI_DEFAULT")
|
||||
#endif
|
||||
#undef ANSI_DEFAULT
|
||||
# endif
|
||||
#endif
|
||||
/* only one screen package is allowed */
|
||||
# if defined(SCREEN_BIOS) && defined(SCREEN_DJGPPFAST)
|
||||
# if defined(_MSC_VER) || defined(__SC__)
|
||||
# pragma message("Warning -- More than one screen package defined in pcconf.h")
|
||||
# endif
|
||||
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__SC__)
|
||||
# if defined(SCREEN_DJGPPFAST)
|
||||
# if defined(_MSC_VER) || defined(__SC__)
|
||||
# pragma message(" Forcing undef of SCREEN_DJGPPFAST")
|
||||
# endif
|
||||
#undef SCREEN_DJGPPFAST /* Can't use djgpp fast with other compilers anyway */
|
||||
# endif
|
||||
# else
|
||||
#if defined(SCREEN_BIOS) && defined(SCREEN_DJGPPFAST)
|
||||
#if defined(_MSC_VER) || defined(__SC__)
|
||||
#pragma message("Warning -- More than one screen package defined in pcconf.h")
|
||||
#endif
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__SC__)
|
||||
#if defined(SCREEN_DJGPPFAST)
|
||||
#if defined(_MSC_VER) || defined(__SC__)
|
||||
#pragma message(" Forcing undef of SCREEN_DJGPPFAST")
|
||||
#endif
|
||||
#undef SCREEN_DJGPPFAST /* Can't use djgpp fast with other compilers anyway \
|
||||
*/
|
||||
#endif
|
||||
#else
|
||||
/* djgpp C compiler */
|
||||
# if defined(SCREEN_BIOS)
|
||||
#if defined(SCREEN_BIOS)
|
||||
#undef SCREEN_BIOS
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
# define ASCIIGRAPH
|
||||
# ifdef TEXTCOLOR
|
||||
# define VIDEOSHADES
|
||||
# endif
|
||||
/* SCREEN_8514, SCREEN_VESA are only placeholders presently - sub VGA instead */
|
||||
# if defined(SCREEN_8514) || defined(SCREEN_VESA)
|
||||
# undef SCREEN_8514
|
||||
# undef SCREEN_VESA
|
||||
# define SCREEN_VGA
|
||||
# endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#define ASCIIGRAPH
|
||||
#ifdef TEXTCOLOR
|
||||
#define VIDEOSHADES
|
||||
#endif
|
||||
/* SCREEN_8514, SCREEN_VESA are only placeholders presently - sub VGA instead
|
||||
*/
|
||||
#if defined(SCREEN_8514) || defined(SCREEN_VESA)
|
||||
#undef SCREEN_8514
|
||||
#undef SCREEN_VESA
|
||||
#define SCREEN_VGA
|
||||
#endif
|
||||
/* Graphical tile sanity checks */
|
||||
# ifdef SCREEN_VGA
|
||||
# define SIMULATE_CURSOR
|
||||
# define POSITIONBAR
|
||||
#ifdef SCREEN_VGA
|
||||
#define SIMULATE_CURSOR
|
||||
#define POSITIONBAR
|
||||
/* Select appropriate tile file format, and map size */
|
||||
# define PLANAR_FILE
|
||||
# define SMALL_MAP
|
||||
# endif
|
||||
#endif /* End of sanity check block */
|
||||
#define PLANAR_FILE
|
||||
#define SMALL_MAP
|
||||
#endif
|
||||
#endif /* End of sanity check block */
|
||||
|
||||
#if defined(MSDOS) && defined(DLB)
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 7)
|
||||
#pragma warning(disable:4131)
|
||||
#pragma warning(disable:4135)
|
||||
#pragma warning(disable:4309)
|
||||
#pragma warning(disable:4746)
|
||||
#pragma warning(disable:4761)
|
||||
#pragma warning(disable : 4131)
|
||||
#pragma warning(disable : 4135)
|
||||
#pragma warning(disable : 4309)
|
||||
#pragma warning(disable : 4746)
|
||||
#pragma warning(disable : 4761)
|
||||
#endif
|
||||
|
||||
#ifdef TIMED_DELAY
|
||||
# ifdef __DJGPP__
|
||||
# define msleep(k) (void) usleep((k)*1000)
|
||||
# endif
|
||||
# ifdef __BORLANDC__
|
||||
# define msleep(k) delay(k)
|
||||
# endif
|
||||
# ifdef __SC__
|
||||
# define msleep(k) (void) usleep((long)((k)*1000))
|
||||
# endif
|
||||
#ifdef __DJGPP__
|
||||
#define msleep(k) (void) usleep((k) *1000)
|
||||
#endif
|
||||
#ifdef __BORLANDC__
|
||||
#define msleep(k) delay(k)
|
||||
#endif
|
||||
#ifdef __SC__
|
||||
#define msleep(k) (void) usleep((long)((k) *1000))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* PCCONF_H */
|
||||
|
||||
Reference in New Issue
Block a user