summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authorevktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-04 16:58:08 +0000
committerevktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-04 16:58:08 +0000
commit3426bfa520d75a7030982173676be5ce3d1dc36e (patch)
treecab7a485e64ee0f702781e14ba127973fb56f0e3 /crawl-ref/source/spells2.cc
parent459a7d4171d64ee57ca033f50b2d521d0b1c2d78 (diff)
downloadcrawl-ref-3426bfa520d75a7030982173676be5ce3d1dc36e.tar.gz
crawl-ref-3426bfa520d75a7030982173676be5ce3d1dc36e.zip
Call Canine Familiar only calls friendly canines (plus changelog update on the summon changes).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10620 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index c93aa41ad2..1bc2ee76db 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1215,11 +1215,8 @@ bool cast_call_canine_familiar(int pow, god_type god)
const int dur = std::min(2 + (random2(pow) / 4), 6);
- const bool friendly = (random2(pow) > 3);
-
if (create_monster(
- mgen_data(mon,
- friendly ? BEH_FRIENDLY : BEH_HOSTILE,
+ mgen_data(mon, BEH_FRIENDLY,
dur, SPELL_CALL_CANINE_FAMILIAR,
you.pos(),
MHITYOU,
@@ -1229,8 +1226,6 @@ bool cast_call_canine_familiar(int pow, god_type god)
mpr("A canine appears!");
- if (!friendly)
- mpr("It doesn't look very happy.");
}
else
canned_msg(MSG_NOTHING_HAPPENS);