summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-16 19:13:32 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-16 19:13:32 +0000
commit8d5b0016051005ca53981b9e6908e318d8f3163c (patch)
tree92ea0a5ae4dec893e4fbe88d80d5ba8d6094d8f0 /crawl-ref/source/player.cc
parentb0d1c0cf7315275fa5cb8854f5e3c44a0764a616 (diff)
downloadcrawl-ref-8d5b0016051005ca53981b9e6908e318d8f3163c.tar.gz
crawl-ref-8d5b0016051005ca53981b9e6908e318d8f3163c.zip
Move asphyxiation resistance to the actor interface.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index a210328302..47720f878c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1474,6 +1474,7 @@ bool player_res_asphyx()
case TRAN_AIR:
return (true);
}
+
return (false);
}
@@ -6467,11 +6468,6 @@ int player::res_fire() const
return (player_res_fire());
}
-int player::res_sticky_flame() const
-{
- return (player_res_sticky_flame());
-}
-
int player::res_steam() const
{
return (player_res_steam());
@@ -6487,11 +6483,21 @@ int player::res_elec() const
return (player_res_electricity() * 2);
}
+int player::res_asphyx() const
+{
+ return (player_res_asphyx());
+}
+
int player::res_poison() const
{
return (player_res_poison());
}
+int player::res_sticky_flame() const
+{
+ return (player_res_sticky_flame());
+}
+
int player::res_negative_energy() const
{
return (player_prot_life());