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
@@ -1,76 +1,77 @@
|
||||
/* NetHack 3.6 amiconf.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 amiconf.h $Date: 2012/01/10 17:47:16 $ $Revision: 1.8 $ */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1990, 1991, 1992, 1993. */
|
||||
/* 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 */
|
||||
#undef abs /* avoid using macro form of abs */
|
||||
#ifndef __SASC_60
|
||||
# undef min /* this gets redefined */
|
||||
# undef max /* this gets redefined */
|
||||
#undef min /* this gets redefined */
|
||||
#undef max /* this gets redefined */
|
||||
#endif
|
||||
|
||||
#include <time.h> /* get time_t defined before use! */
|
||||
#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 */
|
||||
#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... */
|
||||
#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
|
||||
# define DCC30_BUG /* A bitfield bug (from dog.c, others) in DICE 3.0. */
|
||||
#define _SIZE_T
|
||||
#define DCC30_BUG /* A bitfield bug (from dog.c, others) in DICE 3.0. */
|
||||
#endif
|
||||
|
||||
#ifndef __GNUC__
|
||||
typedef long off_t;
|
||||
#endif
|
||||
|
||||
#define MICRO /* must be defined to allow some inclusions */
|
||||
#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 */
|
||||
#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 */
|
||||
#define DLBFILE "NetHack:nhdat" /* main library */
|
||||
#define DLBFILE2 "NetHack:nhsdat" /* sound library */
|
||||
#else
|
||||
# define DLBFILE "nhdat" /* main library */
|
||||
# define DLBFILE2 "nhsdat" /* sound library */
|
||||
#define DLBFILE "nhdat" /* main library */
|
||||
#define DLBFILE2 "nhsdat" /* sound library */
|
||||
#endif
|
||||
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
|
||||
#ifndef __SASC_60
|
||||
# define O_BINARY 0
|
||||
#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
|
||||
#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 MFLOPPY /* You'll probably want this; provides assistance \
|
||||
* for typical personal computer configurations \
|
||||
*/
|
||||
#define RANDOM
|
||||
|
||||
/* ### amidos.c ### */
|
||||
|
||||
extern void FDECL(nethack_exit, (int));
|
||||
extern void FDECL(nethack_exit, (int));
|
||||
|
||||
/* ### amiwbench.c ### */
|
||||
|
||||
@@ -82,7 +83,7 @@ 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 *));
|
||||
extern void FDECL(getlind, (const char *, char *, const char *));
|
||||
|
||||
/* ### winreq.c ### */
|
||||
|
||||
@@ -109,14 +110,14 @@ extern char **ami_argv;
|
||||
#endif
|
||||
|
||||
#ifndef PCCONF_H
|
||||
#include "pcconf.h" /* remainder of stuff is almost same as the PC */
|
||||
#include "pcconf.h" /* remainder of stuff is almost same as the PC */
|
||||
#endif
|
||||
|
||||
#define remove(x) unlink(x)
|
||||
#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)
|
||||
#define rewind(f) fseek(f, 0, 0)
|
||||
#endif
|
||||
|
||||
#ifdef AZTEC_C
|
||||
@@ -124,68 +125,68 @@ extern FILE *FDECL(freopen, (const char *, const char *, FILE *));
|
||||
extern char *FDECL(gets, (char *));
|
||||
#endif
|
||||
|
||||
#define msmsg printf
|
||||
#define msmsg printf
|
||||
|
||||
/*
|
||||
* If AZTEC_C we can't use the long cpath in vision.c....
|
||||
*/
|
||||
#ifdef AZTEC_C
|
||||
# undef MACRO_CPATH
|
||||
#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 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 */
|
||||
/* WRONG - AMIGA_INTUITION should go away */
|
||||
#ifdef AMII_GRAPHICS
|
||||
# define AMIGA_INTUITION /* high power graphics interface (amii) */
|
||||
#define AMIGA_INTUITION /* high power graphics interface (amii) */
|
||||
#endif
|
||||
|
||||
#define CHANGE_COLOR 1
|
||||
#define CHANGE_COLOR 1
|
||||
|
||||
#ifdef TEXTCOLOR
|
||||
# define DEPTH 6 /* Maximum depth of the screen allowed */
|
||||
#ifdef TEXTCOLOR
|
||||
#define DEPTH 6 /* Maximum depth of the screen allowed */
|
||||
#else
|
||||
# define DEPTH 2 /* Four colors...sigh... */
|
||||
#define DEPTH 2 /* Four colors...sigh... */
|
||||
#endif
|
||||
|
||||
#define AMII_MAXCOLORS (1L<<DEPTH)
|
||||
#define AMII_MAXCOLORS (1L << DEPTH)
|
||||
typedef unsigned short AMII_COLOR_TYPE;
|
||||
|
||||
#define PORT_HELP "nethack:amii.hlp"
|
||||
#define PORT_HELP "nethack:amii.hlp"
|
||||
|
||||
#undef TERMLIB
|
||||
#undef TERMLIB
|
||||
|
||||
#define AMII_MUFFLED_VOLUME 40
|
||||
#define AMII_SOFT_VOLUME 50
|
||||
#define AMII_OKAY_VOLUME 60
|
||||
#define AMII_LOUDER_VOLUME 80
|
||||
#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
|
||||
#define ANSI_DEFAULT
|
||||
#endif
|
||||
|
||||
extern int amibbs; /* BBS mode? */
|
||||
extern int amibbs; /* BBS mode? */
|
||||
|
||||
#ifdef AMII_GRAPHICS
|
||||
extern int amii_numcolors;
|
||||
void FDECL( amii_setpens, (int) );
|
||||
void FDECL(amii_setpens, (int));
|
||||
#endif
|
||||
|
||||
/* for cmd.c: override version in micro.h */
|
||||
#ifdef __SASC_60
|
||||
# undef M
|
||||
# define M(c) ((c) - 128 )
|
||||
#undef M
|
||||
#define M(c) ((c) -128)
|
||||
#endif
|
||||
|
||||
#endif /* AMICONF_H */
|
||||
|
||||
Reference in New Issue
Block a user