From 31572bc04436d47f93998921996ff0e12e8ef360 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Tue, 1 Apr 2008 14:22:36 +0000
Subject: Fixed royal jelly passive damage in monster-vs-monster combat.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4022 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/player.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/player.cc')

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index bdc7ba2615..ac233e5034 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6194,7 +6194,7 @@ void player::teleport(bool now, bool abyss_shift)
         you_teleport();
 }
 
-void player::hurt(const actor *agent, int amount)
+int player::hurt(const actor *agent, int amount)
 {
     const monsters *mon = dynamic_cast<const monsters*>(agent);
     if (agent->atype() == ACT_MONSTER)
@@ -6208,6 +6208,7 @@ void player::hurt(const actor *agent, int amount)
         ASSERT(false);
         ouch(amount, 0, KILLED_BY_SOMETHING);
     }
+    return (amount);
 }
 
 void player::drain_stat(int stat, int amount, actor* attacker)
-- 
cgit v1.2.3-54-g00ecf