diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 18:07:20 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 18:07:20 +0000 |
| commit | ca67d2a004ef61ceb1ded81f435119caa53af1f2 (patch) | |
| tree | b547d5be8fb4b0a4c55250b3b877d7b51fed10d4 /crawl-ref/source/player.cc | |
| parent | ad56ba63d755da4dca3d44947f3f86a26faf7aa3 (diff) | |
| download | crawl-ref-ca67d2a004ef61ceb1ded81f435119caa53af1f2.tar.gz crawl-ref-ca67d2a004ef61ceb1ded81f435119caa53af1f2.zip | |
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
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 10 |
1 files changed, 3 insertions, 7 deletions
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<monsters*>(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<monsters*>(other); + if (!mons_friendly(mon) && !mons_neutral(mon)) + pet_target = monster_index(mon); } if (mutation[MUT_BERSERK] |