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:
@@ -20,19 +20,19 @@
|
||||
*/
|
||||
|
||||
struct attack {
|
||||
uchar aatyp;
|
||||
uchar adtyp, damn, damd;
|
||||
uchar aatyp;
|
||||
uchar adtyp, damn, damd;
|
||||
};
|
||||
|
||||
/* Max # of attacks for any given monster.
|
||||
*/
|
||||
|
||||
#define NATTK 6
|
||||
#define NATTK 6
|
||||
|
||||
/* Weight of a human body
|
||||
*/
|
||||
|
||||
#define WT_HUMAN 1450
|
||||
#define WT_HUMAN 1450
|
||||
|
||||
#ifndef ALIGN_H
|
||||
#include "align.h"
|
||||
@@ -41,31 +41,30 @@ struct attack {
|
||||
#include "monflag.h"
|
||||
|
||||
struct permonst {
|
||||
const char *mname; /* full name */
|
||||
char mlet; /* symbol */
|
||||
schar mlevel, /* base monster level */
|
||||
mmove, /* move speed */
|
||||
ac, /* (base) armor class */
|
||||
mr; /* (base) magic resistance */
|
||||
aligntyp maligntyp; /* basic monster alignment */
|
||||
unsigned short geno; /* creation/geno mask value */
|
||||
struct attack mattk[NATTK]; /* attacks matrix */
|
||||
unsigned short cwt, /* weight of corpse */
|
||||
cnutrit; /* its nutritional value */
|
||||
uchar msound; /* noise it makes (6 bits) */
|
||||
uchar msize; /* physical size (3 bits) */
|
||||
uchar mresists; /* resistances */
|
||||
uchar mconveys; /* conveyed by eating */
|
||||
unsigned long mflags1, /* boolean bitflags */
|
||||
mflags2; /* more boolean bitflags */
|
||||
unsigned short mflags3; /* yet more boolean bitflags */
|
||||
# ifdef TEXTCOLOR
|
||||
uchar mcolor; /* color to use */
|
||||
# endif
|
||||
const char *mname; /* full name */
|
||||
char mlet; /* symbol */
|
||||
schar mlevel, /* base monster level */
|
||||
mmove, /* move speed */
|
||||
ac, /* (base) armor class */
|
||||
mr; /* (base) magic resistance */
|
||||
aligntyp maligntyp; /* basic monster alignment */
|
||||
unsigned short geno; /* creation/geno mask value */
|
||||
struct attack mattk[NATTK]; /* attacks matrix */
|
||||
unsigned short cwt, /* weight of corpse */
|
||||
cnutrit; /* its nutritional value */
|
||||
uchar msound; /* noise it makes (6 bits) */
|
||||
uchar msize; /* physical size (3 bits) */
|
||||
uchar mresists; /* resistances */
|
||||
uchar mconveys; /* conveyed by eating */
|
||||
unsigned long mflags1, /* boolean bitflags */
|
||||
mflags2; /* more boolean bitflags */
|
||||
unsigned short mflags3; /* yet more boolean bitflags */
|
||||
#ifdef TEXTCOLOR
|
||||
uchar mcolor; /* color to use */
|
||||
#endif
|
||||
};
|
||||
|
||||
extern NEARDATA struct permonst
|
||||
mons[]; /* the master list of monster types */
|
||||
extern NEARDATA struct permonst mons[]; /* the master list of monster types */
|
||||
|
||||
#define VERY_SLOW 3
|
||||
#define SLOW_SPEED 9
|
||||
@@ -73,10 +72,10 @@ extern NEARDATA struct permonst
|
||||
#define FAST_SPEED 15
|
||||
#define VERY_FAST 24
|
||||
|
||||
#define NON_PM PM_PLAYERMON /* "not a monster" */
|
||||
#define LOW_PM (NON_PM+1) /* first monster in mons[] */
|
||||
#define SPECIAL_PM PM_LONG_WORM_TAIL /* [normal] < ~ < [special] */
|
||||
/* mons[SPECIAL_PM] through mons[NUMMONS-1], inclusive, are
|
||||
never generated randomly and cannot be polymorphed into */
|
||||
#define NON_PM PM_PLAYERMON /* "not a monster" */
|
||||
#define LOW_PM (NON_PM + 1) /* first monster in mons[] */
|
||||
#define SPECIAL_PM PM_LONG_WORM_TAIL /* [normal] < ~ < [special] */
|
||||
/* mons[SPECIAL_PM] through mons[NUMMONS-1], inclusive, are
|
||||
never generated randomly and cannot be polymorphed into */
|
||||
|
||||
#endif /* PERMONST_H */
|
||||
|
||||
Reference in New Issue
Block a user