define WT_ macros in a header file
A recently added #undef WT_ELF caused a onefile build to break. trap.c: In function 'trapeffect_landmine': trap.c:2346:41: error: 'WT_ELF' undeclared (first use in this function); did you mean 'PM_ELF'? trap.c:2346:41: note: each undeclared identifier is reported only once for each function it appears in
This commit is contained in:
@@ -3,14 +3,6 @@
|
|||||||
/*-Copyright (c) Michael Allison, 2006. */
|
/*-Copyright (c) Michael Allison, 2006. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
#ifndef WT_ELF
|
|
||||||
#define WT_ELF 800
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef WT_DRAGON
|
|
||||||
#define WT_DRAGON 4500
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MONS_ENUM)
|
#if defined(MONS_ENUM)
|
||||||
#define MON(nam, sym, lvl, gen, atk, siz, mr1, mr2, flg1, flg2, flg3, d, \
|
#define MON(nam, sym, lvl, gen, atk, siz, mr1, mr2, flg1, flg2, flg3, d, \
|
||||||
col, bn) PM_##bn
|
col, bn) PM_##bn
|
||||||
|
|||||||
+3
-2
@@ -28,10 +28,11 @@ struct attack {
|
|||||||
|
|
||||||
#define NATTK 6
|
#define NATTK 6
|
||||||
|
|
||||||
/* Weight of a human body
|
/* Weight of human body, elf, dragon
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WT_HUMAN 1450
|
#define WT_HUMAN 1450
|
||||||
|
#define WT_ELF 800
|
||||||
|
#define WT_DRAGON 4500
|
||||||
|
|
||||||
#ifndef ALIGN_H
|
#ifndef ALIGN_H
|
||||||
#include "align.h"
|
#include "align.h"
|
||||||
|
|||||||
@@ -25,9 +25,6 @@
|
|||||||
0, 0, 0, 0 \
|
0, 0, 0, 0 \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define WT_ELF 800
|
|
||||||
#define WT_DRAGON 4500
|
|
||||||
|
|
||||||
#define MON(nam, sym, lvl, gen, atk, siz, mr1, mr2, \
|
#define MON(nam, sym, lvl, gen, atk, siz, mr1, mr2, \
|
||||||
flg1, flg2, flg3, d, col, bn) \
|
flg1, flg2, flg3, d, col, bn) \
|
||||||
{ \
|
{ \
|
||||||
@@ -89,8 +86,6 @@ const struct attack c_sa_no[NATTK] = SEDUCTION_ATTACKS_NO;
|
|||||||
#undef HI_LORD
|
#undef HI_LORD
|
||||||
#endif
|
#endif
|
||||||
#undef NO_ATTK
|
#undef NO_ATTK
|
||||||
#undef WT_ELF
|
|
||||||
#undef WT_DRAGON
|
|
||||||
#undef MON
|
#undef MON
|
||||||
#undef MON3
|
#undef MON3
|
||||||
#undef LVL
|
#undef LVL
|
||||||
|
|||||||
Reference in New Issue
Block a user