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

47
include/attrib.h
View File

@@ -9,38 +9,41 @@
#ifndef ATTRIB_H
#define ATTRIB_H
#define A_STR 0
#define A_INT 1
#define A_WIS 2
#define A_DEX 3
#define A_CON 4
#define A_CHA 5
#define A_STR 0
#define A_INT 1
#define A_WIS 2
#define A_DEX 3
#define A_CON 4
#define A_CHA 5
#define A_MAX 6 /* used in rn2() selection of attrib */
#define A_MAX 6 /* used in rn2() selection of attrib */
#define ABASE(x) (u.acurr.a[x])
#define ABON(x) (u.abon.a[x])
#define AEXE(x) (u.aexe.a[x])
#define ACURR(x) (acurr(x))
#define ACURRSTR (acurrstr())
#define ABASE(x) (u.acurr.a[x])
#define ABON(x) (u.abon.a[x])
#define AEXE(x) (u.aexe.a[x])
#define ACURR(x) (acurr(x))
#define ACURRSTR (acurrstr())
/* should be: */
/* #define ACURR(x) (ABON(x) + ATEMP(x) + (Upolyd ? MBASE(x) : ABASE(x)) */
#define MCURR(x) (u.macurr.a[x])
#define AMAX(x) (u.amax.a[x])
#define MMAX(x) (u.mamax.a[x])
#define MCURR(x) (u.macurr.a[x])
#define AMAX(x) (u.amax.a[x])
#define MMAX(x) (u.mamax.a[x])
#define ATEMP(x) (u.atemp.a[x])
#define ATIME(x) (u.atime.a[x])
#define ATEMP(x) (u.atemp.a[x])
#define ATIME(x) (u.atime.a[x])
/* KMH -- Conveniences when dealing with strength constants */
#define STR18(x) (18+(x)) /* 18/xx */
#define STR19(x) (100+(x)) /* For 19 and above */
#define STR18(x) (18 + (x)) /* 18/xx */
#define STR19(x) (100 + (x)) /* For 19 and above */
struct attribs {
schar a[A_MAX];
struct attribs {
schar a[A_MAX];
};
#define ATTRMAX(x) ((x == A_STR && Upolyd && strongmonst(youmonst.data)) ? STR18(100) : urace.attrmax[x])
#define ATTRMAX(x) \
((x == A_STR && Upolyd && strongmonst(youmonst.data)) \
? STR18(100) \
: urace.attrmax[x])
#define ATTRMIN(x) (urace.attrmin[x])
#endif /* ATTRIB_H */