summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-act.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-act.cc
parent1b66d630c184ea4f9be104414c18773fc18cb72b (diff)
parent9939a9514e001f19dc384d8ae8b27940327afbe8 (diff)
downloadcrawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.tar.gz
crawl-ref-f8ab5653d8d2df09a719ff09ad51f2cf5294ec8c.zip
Merge branch 'iood'
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
-rw-r--r--crawl-ref/source/mon-act.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 2984379968..092fb0aaa7 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -33,6 +33,7 @@
#include "mon-cast.h"
#include "mon-iter.h"
#include "mon-place.h"
+#include "mon-project.h"
#include "mgen_data.h"
#include "coord.h"
#include "mon-stuff.h"
@@ -1725,6 +1726,14 @@ static void _handle_monster_move(monsters *monster)
}
old_energy = monster->speed_increment;
+ if (mons_is_projectile(monster->type))
+ {
+ if (iood_act(*monster))
+ return;
+ monster->lose_energy(EUT_MOVE);
+ continue;
+ }
+
monster->shield_blocks = 0;
cloud_type cl_type;