summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 12:49:40 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 12:49:40 +0000
commit3e17829c6b5d11b23fda59f0dd38b8aa88638f39 (patch)
treefe9970c069fa91ae39e05d4d7fb9d58bd969ae11 /crawl-ref/source/player.cc
parent9eff4a73889f90cea1f4d5c869205f9e127c20c5 (diff)
downloadcrawl-ref-3e17829c6b5d11b23fda59f0dd38b8aa88638f39.tar.gz
crawl-ref-3e17829c6b5d11b23fda59f0dd38b8aa88638f39.zip
The royal jelly can no longer expel lesser jellies when tormented.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6921 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index fe0e26a6fc..ab1e3d668b 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6504,7 +6504,7 @@ void player::teleport(bool now, bool abyss_shift)
you_teleport();
}
-int player::hurt(const actor *agent, int amount)
+int player::hurt(const actor *agent, int amount, beam_type flavour)
{
const monsters *mon = dynamic_cast<const monsters*>(agent);
if (agent->atype() == ACT_MONSTER)