Fix 2815574: Venom card not waking monsters.

Fix 2815185: Not updating wield display for rotting chunks.
Fix 2812496: Wrong message when attempting to chop with unwieldable
             weapons. (Small patch by rafalmaj.)
Fix 2811476: Turn autopickup back on when gaining see invisible
             (mutation, ring, artefact, spell).
Fix 2806314: Remove coinflip() for Sandblast range. Wielding rocks now
             guarantees range of 2.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10096 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 4 deletions

diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index bc1966fd8f..1d89da8ea2 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -28,6 +28,7 @@ REVISION("$Rev$");
 
 #include "abl-show.h"
 #include "cio.h"
+#include "delay.h"
 #include "defines.h"
 #include "effects.h"
 #include "format.h"
@@ -1978,7 +1979,6 @@ static int _handle_conflicting_mutations(mutation_type mutation,
     };
 
     for (unsigned i = 0; i < ARRAYSZ(simple_conflict); ++i)
-    {
         for (int j = 0; j < 2; ++j)
         {
             // If we have one of the pair, delete a level of the other,
@@ -1991,7 +1991,6 @@ static int _handle_conflicting_mutations(mutation_type mutation,
                 return (1);     // Nothing more to do.
             }
         }
-    }
 
     return (0);
 }
@@ -2192,10 +2191,8 @@ bool mutate(mutation_type which_mutation, bool failMsg,
 
             // Breathe poison replaces spit poison (so it takes the slot).
             for (int i = 0; i < 52; ++i)
-            {
                 if (you.ability_letter_table[i] == ABIL_SPIT_POISON)
                     you.ability_letter_table[i] = ABIL_BREATHE_POISON;
-            }
         }
     }
 
@@ -2272,6 +2269,13 @@ bool mutate(mutation_type which_mutation, bool failMsg,
         }
         break;
 
+    case MUT_ACUTE_VISION:
+        // We might have to turn autopickup back on again.
+        mpr(mdef.gain[you.mutation[mutat]], MSGCH_MUTATION);
+        gain_msg = false;
+        autotoggle_autopickup(false);
+        break;
+
     default:
         break;
     }