Merge branch 'master' into win32-x64-working
This commit is contained in:
@@ -172,6 +172,8 @@
|
||||
#define is_mind_flayer(ptr) ((ptr) == &mons[PM_MIND_FLAYER] || \
|
||||
(ptr) == &mons[PM_MASTER_MIND_FLAYER])
|
||||
|
||||
#define is_vampire(ptr) ((ptr)->mlet == S_VAMPIRE)
|
||||
|
||||
#define nonliving(ptr) (is_golem(ptr) || is_undead(ptr) || \
|
||||
(ptr)->mlet == S_VORTEX || \
|
||||
(ptr) == &mons[PM_MANES])
|
||||
|
||||
Reference in New Issue
Block a user