summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-30 19:20:33 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-30 19:20:33 +0000
commitd275844090cf8209422f2a0a634b304d551f4194 (patch)
treebd658770f12da79b3b550f21fd3e990c6543f4d4 /crawl-ref/source/spells2.cc
parent450f6fd14fe0c09e89ad90eac2a9a6ee9521af69 (diff)
downloadcrawl-ref-d275844090cf8209422f2a0a634b304d551f4194.tar.gz
crawl-ref-d275844090cf8209422f2a0a634b304d551f4194.zip
Fix previous cleanup.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7313 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 5d32629448..6f2e7ee4d3 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1611,6 +1611,8 @@ bool summon_berserker(int pow, god_type god, bool force_hostile)
summon->update_ench(berserk);
summon->update_ench(abj);
+ player_angers_monster(&menv[monster]);
+
return (true);
}
@@ -1619,8 +1621,10 @@ static bool _summon_holy_being_wrapper(god_type god, monster_type mon, int dur,
{
const int monster =
create_monster(
- mgen_data(mon, BEH_FRIENDLY, dur,
- you.pos(), you.pet_target,
+ mgen_data(mon,
+ friendly ? BEH_FRIENDLY : BEH_HOSTILE,
+ dur, you.pos(),
+ friendly ? you.pet_target : MHITYOU,
MG_FORCE_BEH, god));
if (monster == -1)