diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 21:42:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 21:42:05 +0000 |
| commit | 63ade43aec4adc4a3759878b5de6765d8f07cf4a (patch) | |
| tree | ba63b1ceaa9fd8b6119d84ce6f76176d61b23a51 /crawl-ref/source/ouch.cc | |
| parent | 9be5f760e240035249df824060d978db37128404 (diff) | |
| download | crawl-ref-63ade43aec4adc4a3759878b5de6765d8f07cf4a.tar.gz crawl-ref-63ade43aec4adc4a3759878b5de6765d8f07cf4a.zip | |
Apply some more commits to bring 0.4 up to date.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6484 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 79ba0944ee..f53fa8d9bb 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -309,8 +309,7 @@ void weapon_acid( char acid_strength ) msg::stream << "Your " << your_hand(true) << " burn!" << std::endl; ouch( roll_dice( 1, acid_strength ), 0, KILLED_BY_ACID ); } - - if (x_chance_in_y(acid_strength + 1, 20)) + else if (x_chance_in_y(acid_strength + 1, 20)) item_corrode( hand_thing ); } @@ -320,9 +319,9 @@ void item_corrode( int itco ) bool it_resists = false; // code simplifier {dlb} bool suppress_msg = false; // code simplifier {dlb} int how_rusty = ((you.inv[itco].base_type == OBJ_WEAPONS) - ? you.inv[itco].plus2 : you.inv[itco].plus); + ? you.inv[itco].plus2 : you.inv[itco].plus); - // early return for "oRC and cloak/preservation {dlb}: + // Early return for "oRC and cloak/preservation {dlb}. if (wearing_amulet(AMU_RESIST_CORROSION) && !one_chance_in(10)) { #if DEBUG_DIAGNOSTICS |