summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-28 17:04:55 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-28 17:04:55 +0000
commit91ce2cd6087be62362c308ba9ce647d3335fa92e (patch)
tree6d9dcaa2da15b497709d3fb8130002df75f19ef8 /crawl-ref/source/fight.cc
parent3fa87ed8495673bbd6c42e2a21d255d97a7d3636 (diff)
downloadcrawl-ref-91ce2cd6087be62362c308ba9ce647d3335fa92e.tar.gz
crawl-ref-91ce2cd6087be62362c308ba9ce647d3335fa92e.zip
If, as a Beoghite, you forcibly convert an orc by attacking while it's
asleep, end the attack round afterwards, so that you don't make an auxiliary unarmed attack and immediately annoy your new convert. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9282 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 7426654299..179500c31d 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -917,6 +917,7 @@ bool melee_attack::player_attack()
// Call function of orcs first noticing you, but with
// beaten-up conversion messages (if applicable).
beogh_follower_convert(defender_as_monster(), true);
+ return (true);
}
}
else