summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-08 19:13:30 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-08 19:13:30 +0000
commit06c5d3d75459c2f78297095550311e8aac37af80 (patch)
tree79b70d65b32e70caabbf2a25e90fee98acdefdda /crawl-ref/source/player.cc
parent9a20cf0a34b9caec2ff9a5c3708a88fb84c80496 (diff)
downloadcrawl-ref-06c5d3d75459c2f78297095550311e8aac37af80.tar.gz
crawl-ref-06c5d3d75459c2f78297095550311e8aac37af80.zip
Clean up nutrition-related functions a bit, and handle non-vampires'
nutrition from blood potions more consistently. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8983 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 7da768afee..57f1809db3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -412,9 +412,9 @@ bool player_likes_water(bool permanently)
return (player_can_swim() || (!permanently && beogh_water_walk()));
}
-bool player_is_swimming(void)
+bool player_is_swimming()
{
- return you.swimming();
+ return (you.swimming());
}
bool player_under_penance(void)
@@ -1289,6 +1289,11 @@ bool player_can_smell()
return (you.species != SP_MUMMY);
}
+bool player_likes_chunks()
+{
+ return (you.omnivorous() || player_mutation_level(MUT_CARNIVOROUS) > 0);
+}
+
// If temp is set to false, temporary sources or resistance won't be counted.
int player_res_fire(bool calc_unid, bool temp, bool items)
{
@@ -4415,7 +4420,7 @@ bool extrinsic_amulet_effect(jewellery_type amulet)
bool wearing_amulet(jewellery_type amulet, bool calc_unid)
{
- if ( extrinsic_amulet_effect(amulet) )
+ if (extrinsic_amulet_effect(amulet))
return (true);
if (you.equip[EQ_AMULET] == -1)