summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-31 14:49:01 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-31 14:50:26 +0100
commitf8ab5653d8d2df09a719ff09ad51f2cf5294ec8c (patch)
tree03e842701ef2919242ee4e680a0ae22ab0fc6b83 /crawl-ref/source/mon-util.cc
parent1b66d630c184ea4f9be104414c18773fc18cb72b (diff)
parent9939a9514e001f19dc384d8ae8b27940327afbe8 (diff)
downloadcrawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.tar.gz
crawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.zip
Merge branch 'iood'
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index b7e6c40e97..008ce07a2c 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -485,6 +485,11 @@ bool mons_is_fast(const monsters *mon)
return (mon->speed > pspeed);
}
+bool mons_is_projectile(int mc)
+{
+ return (mc == MONS_ORB_OF_DESTRUCTION);
+}
+
bool mons_is_insubstantial(int mc)
{
return (mons_class_flag(mc, M_INSUBSTANTIAL));
@@ -2024,7 +2029,8 @@ bool mons_wields_two_weapons(const monsters *mon)
bool mons_self_destructs(const monsters *m)
{
- return (m->type == MONS_GIANT_SPORE || m->type == MONS_BALL_LIGHTNING);
+ return (m->type == MONS_GIANT_SPORE || m->type == MONS_BALL_LIGHTNING
+ || m->type == MONS_ORB_OF_DESTRUCTION);
}
int mons_base_damage_brand(const monsters *m)