Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-24 11:50:34 -04:00
13 changed files with 88 additions and 30 deletions

View File

@@ -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])