nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Reformat .h files.

Browse Source 
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
2015-05-25 09:03:10 +09:00
parent 26ee7dc370
commit 8b57d96fd2
156 changed files with 10712 additions and 10701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
include/dgn_file.h
View File

@@ -15,64 +15,60 @@
* Structures manipulated by the dungeon loader & compiler
*/
struct couple {
short base, rand;
struct couple {
short base, rand;
};
struct tmpdungeon {
char name[24],
protoname[24];
struct couple lev;
int flags,
chance,
levels,
branches,
entry_lev; /* entry level for this dungeon */
char boneschar;
char name[24], protoname[24];
struct couple lev;
int flags, chance, levels, branches,
entry_lev; /* entry level for this dungeon */
char boneschar;
};
struct tmplevel {
char name[24];
struct couple lev;
int chance, rndlevs, chain, flags;
char boneschar;
char name[24];
struct couple lev;
int chance, rndlevs, chain, flags;
char boneschar;
};
struct tmpbranch {
char name[24]; /* destination dungeon name */
struct couple lev;
int chain; /* index into tmplevel array (chained branch)*/
int type; /* branch type (see below) */
int up; /* branch is up or down */
char name[24]; /* destination dungeon name */
struct couple lev;
int chain; /* index into tmplevel array (chained branch)*/
int type; /* branch type (see below) */
int up; /* branch is up or down */
};
/*
* Values for type for tmpbranch structure.
*/
#define TBR_STAIR 0 /* connection with both ends having a staircase */
#define TBR_NO_UP 1 /* connection with no up staircase */
#define TBR_NO_DOWN 2 /* connection with no down staircase */
#define TBR_PORTAL 3 /* portal connection */
#define TBR_STAIR 0 /* connection with both ends having a staircase */
#define TBR_NO_UP 1 /* connection with no up staircase */
#define TBR_NO_DOWN 2 /* connection with no down staircase */
#define TBR_PORTAL 3 /* portal connection */
/*
* Flags that map into the dungeon flags bitfields.
*/
#define TOWN 1 /* levels only */
#define HELLISH 2
#define MAZELIKE 4
#define ROGUELIKE 8
#define TOWN 1 /* levels only */
#define HELLISH 2
#define MAZELIKE 4
#define ROGUELIKE 8
#define D_ALIGN_NONE 0
#define D_ALIGN_CHAOTIC (AM_CHAOTIC << 4)
#define D_ALIGN_NEUTRAL (AM_NEUTRAL << 4)
#define D_ALIGN_LAWFUL (AM_LAWFUL << 4)
#define D_ALIGN_NONE 0
#define D_ALIGN_CHAOTIC (AM_CHAOTIC << 4)
#define D_ALIGN_NEUTRAL (AM_NEUTRAL << 4)
#define D_ALIGN_LAWFUL (AM_LAWFUL << 4)
#define D_ALIGN_MASK 0x70
#define D_ALIGN_MASK 0x70
/*
* Max number of prototype levels and branches.
*/
#define LEV_LIMIT 50
#define BRANCH_LIMIT 32
#define LEV_LIMIT 50
#define BRANCH_LIMIT 32
#endif /* DGN_FILE_H */