summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index abf7f089e0..bdd629580a 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5055,9 +5055,6 @@ int player::holiness() const
if (is_undead)
return (MH_UNDEAD);
- if (species == SP_DEMONSPAWN)
- return (MH_DEMONIC);
-
return (MH_NATURAL);
}
@@ -5128,10 +5125,10 @@ void player::teleport(bool now, bool abyss_shift)
you_teleport();
}
-void player::hurt(actor *agent, int amount)
+void player::hurt(const actor *agent, int amount)
{
if (agent->atype() == ACT_MONSTER)
- ouch(amount, monster_index( dynamic_cast<monsters*>(agent) ),
+ ouch(amount, monster_index( dynamic_cast<const monsters*>(agent) ),
KILLED_BY_MONSTER);
else
{