summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 21:57:12 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 21:57:12 +0000
commitbf2a59fd761571998062b21409ee678e2852254b (patch)
treebe3130faa7dd7c8a41c0c5b1c0a7a7a104ce0860 /crawl-ref/source/xom.cc
parentd0e164c2124ff90bca9eef4b06f9d2f0a9006964 (diff)
downloadcrawl-ref-bf2a59fd761571998062b21409ee678e2852254b.tar.gz
crawl-ref-bf2a59fd761571998062b21409ee678e2852254b.zip
Add missing tension check for one of Xom's friendly summoning routines.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8183 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 7904b6f1a0..360bf995a8 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -878,7 +878,8 @@ static bool _xom_is_good(int sever, int tension)
done = true;
}
- else if (x_chance_in_y(7, sever))
+ // It's pointless to send in help if there's no danger.
+ else if (tension > 0 && x_chance_in_y(7, sever))
{
monster_type mon = _xom_random_demon(sever);
const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
@@ -1634,6 +1635,7 @@ static bool _xom_is_bad(int sever, int tension)
mon_inv_type slots[] = {MSLOT_WEAPON, MSLOT_ALT_WEAPON,
MSLOT_MISSILE};
+
for (int i = 0; i < 3; ++i)
{
int idx = mon->inv[slots[i]];