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/item_use.cc | |
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/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 077f6604f5..242f71a3a3 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -890,15 +890,16 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) && (ignore_temporary || !player_is_shapechanged())) { if (verbose) - mpr("That helmet does not fit your head!"); + mpr("That helmet does not fit your head!"); return (false); } } - else if (!can_equip( slot, ignore_temporary )) + + if (!can_equip( slot, ignore_temporary )) { if (verbose) - mpr("You can't wear that in your present form."); + mpr("You can't wear that in your present form."); return (false); } |