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:
@@ -9,45 +9,45 @@
|
||||
#ifndef LEV_H
|
||||
#define LEV_H
|
||||
|
||||
#define COUNT_SAVE 0x1
|
||||
#define WRITE_SAVE 0x2
|
||||
#define FREE_SAVE 0x4
|
||||
#define COUNT_SAVE 0x1
|
||||
#define WRITE_SAVE 0x2
|
||||
#define FREE_SAVE 0x4
|
||||
|
||||
#define MAX_BMASK 4
|
||||
#define MAX_BMASK 4
|
||||
|
||||
/* operations of the various saveXXXchn & co. routines */
|
||||
#define perform_bwrite(mode) ((mode) & (COUNT_SAVE|WRITE_SAVE))
|
||||
#define release_data(mode) ((mode) & FREE_SAVE)
|
||||
#define perform_bwrite(mode) ((mode) & (COUNT_SAVE | WRITE_SAVE))
|
||||
#define release_data(mode) ((mode) &FREE_SAVE)
|
||||
|
||||
/* The following are used in mkmaze.c */
|
||||
struct container {
|
||||
struct container *next;
|
||||
xchar x, y;
|
||||
short what;
|
||||
genericptr_t list;
|
||||
struct container *next;
|
||||
xchar x, y;
|
||||
short what;
|
||||
genericptr_t list;
|
||||
};
|
||||
|
||||
#define CONS_OBJ 0
|
||||
#define CONS_MON 1
|
||||
#define CONS_HERO 2
|
||||
#define CONS_TRAP 3
|
||||
#define CONS_OBJ 0
|
||||
#define CONS_MON 1
|
||||
#define CONS_HERO 2
|
||||
#define CONS_TRAP 3
|
||||
|
||||
struct bubble {
|
||||
xchar x, y; /* coordinates of the upper left corner */
|
||||
schar dx, dy; /* the general direction of the bubble's movement */
|
||||
uchar bm[MAX_BMASK+2]; /* bubble bit mask */
|
||||
struct bubble *prev, *next; /* need to traverse the list up and down */
|
||||
struct container *cons;
|
||||
xchar x, y; /* coordinates of the upper left corner */
|
||||
schar dx, dy; /* the general direction of the bubble's movement */
|
||||
uchar bm[MAX_BMASK + 2]; /* bubble bit mask */
|
||||
struct bubble *prev, *next; /* need to traverse the list up and down */
|
||||
struct container *cons;
|
||||
};
|
||||
|
||||
/* used in light.c */
|
||||
typedef struct ls_t {
|
||||
struct ls_t *next;
|
||||
xchar x, y; /* source's position */
|
||||
short range; /* source's current range */
|
||||
xchar x, y; /* source's position */
|
||||
short range; /* source's current range */
|
||||
short flags;
|
||||
short type; /* type of light source */
|
||||
anything id; /* source's identifier */
|
||||
short type; /* type of light source */
|
||||
anything id; /* source's identifier */
|
||||
} light_source;
|
||||
|
||||
#endif /* LEV_H */
|
||||
|
||||
Reference in New Issue
Block a user