Fix Evaporate prompt doing the opposite of the player's answer.

Fix some more instances of crashes resulting from PROMPT_NOTHING.
Change shadow dragon corpse type to rotting.


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

1 files changed, 10 insertions, 9 deletions

diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 09eef4b231..3d58cdc192 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -1419,18 +1419,19 @@ bool cast_evaporate(int pow, bolt& beem, int potion)
     }
 
     // Fire tracer.
-    beem.source_x      = you.x_pos;
-    beem.source_y      = you.y_pos;
-    beem.can_see_invis = player_see_invis();
-    beem.smart_monster = true;
-    beem.attitude      = ATT_FRIENDLY;
-    beem.fr_count      = 0;
-    beem.is_tracer     = true;
+    beem.source_x       = you.x_pos;
+    beem.source_y       = you.y_pos;
+    beem.can_see_invis  = player_see_invis();
+    beem.smart_monster  = true;
+    beem.attitude       = ATT_FRIENDLY;
+    beem.fr_count       = 0;
+    beem.beam_cancelled = false;
+    beem.is_tracer      = true;
     fire_beam(beem);
 
-    if (beem.fr_count > 0)
+    if (beem.beam_cancelled)
     {
-        // We don't want to fire through friendlies.
+        // We don't want to fire through friendlies or at ourselves.
         canned_msg(MSG_OK);
         return (false);
     }