From ca67d2a004ef61ceb1ded81f435119caa53af1f2 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 19 May 2008 18:07:20 +0000 Subject: And make attacks on god gifts consistent with beams the same way. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5134 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/player.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 7fdcf0a035..a33f60f264 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5941,13 +5941,9 @@ void player::attacking(actor *other) { if (other && other->atype() == ACT_MONSTER) { - const monsters *mons = dynamic_cast(other); - if (mons_friendly(mons)) - did_god_conduct(DID_ATTACK_FRIEND, 5, true, mons); - else if (mons_neutral(mons)) - did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, mons); - else - pet_target = monster_index(mons); + const monsters *mon = dynamic_cast(other); + if (!mons_friendly(mon) && !mons_neutral(mon)) + pet_target = monster_index(mon); } if (mutation[MUT_BERSERK] -- cgit v1.2.3-54-g00ecf