summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/wiz-fsim.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-08 02:31:36 -0400
committerNeil Moore <neil@s-z.org>2014-07-08 02:31:36 -0400
commit6b67a3050070d27c424b89e7652e7824cd5a1fc3 (patch)
tree665360565aae50df259bd9ae1a6ffe4d09469ae0 /crawl-ref/source/wiz-fsim.cc
parent2d7905a8d14a027ad2ce2c2603d18dbc7da8a74a (diff)
downloadcrawl-ref-6b67a3050070d27c424b89e7652e7824cd5a1fc3.tar.gz
crawl-ref-6b67a3050070d27c424b89e7652e7824cd5a1fc3.zip
Don't crash fsim when the player constricts (PleasingFungus)
Diffstat (limited to 'crawl-ref/source/wiz-fsim.cc')
-rw-r--r--crawl-ref/source/wiz-fsim.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index 6b8c0dc124..fdf54e4102 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -365,6 +365,8 @@ static fight_data _get_fight_data(monster &mon, int iter_limit, bool defend)
{
for (int i = 0; i < iter_limit; i++)
{
+ // Don't reset the monster while it is constricted.
+ you.stop_constricting(mon.mid, false, true);
// This sets mgrid(mons.pos()) to NON_MONSTER
mon = orig;
// Re-place the monster if it e.g. blinked away.