diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 19:47:57 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 19:47:57 +0000 |
| commit | b627c9873fff58bc7cb6a163180ad931101fe6fe (patch) | |
| tree | 4eb3afbb3d244c663022de37337343082864e88d /crawl-ref/source/player.h | |
| parent | c90dec78aa011780278f0a695f2e6e0a2e4c2bf8 (diff) | |
| download | crawl-ref-b627c9873fff58bc7cb6a163180ad931101fe6fe.tar.gz crawl-ref-b627c9873fff58bc7cb6a163180ad931101fe6fe.zip | |
Implement FR 1897310: auto-travel through clouds if you are (semi)permanently
immune to them, i.e. your equipment and/or mutations confer resistance at the
necessary level.
Implement FR 1872840: When transforming, only remove clothes you cannot wear
when transformed. Also fix some inconsistencies in what you could keep wearing
and what you could put on while transformed.
And a few more monspeak/wpnnoise replacements.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3588 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.h')
| -rw-r--r-- | crawl-ref/source/player.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index 33f5d3fda6..378629316c 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -148,7 +148,7 @@ int player_magical_power( void ); /* *********************************************************************** * called from: fight - misc - ouch - spells * *********************************************************************** */ -int player_prot_life(bool calc_unid = true); +int player_prot_life(bool calc_unid = true, bool temp = true); /* *********************************************************************** @@ -183,15 +183,15 @@ int player_res_electricity(bool calc_unid = true); /* *********************************************************************** * called from: acr - fight - misc - ouch - spells * *********************************************************************** */ -int player_res_fire(bool calc_unid = true); -int player_res_steam(bool calc_unid = true); +int player_res_fire(bool calc_unid = true, bool temp = true); +int player_res_steam(bool calc_unid = true, bool temp = true); /* *********************************************************************** * called from: beam - decks - fight - fod - it_use2 - misc - ouch - * spells - spells2 * *********************************************************************** */ -int player_res_poison(bool calc_unid = true); +int player_res_poison(bool calc_unid = true, bool temp = true); bool player_control_teleport(bool calc_unid = true); |