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, 13 insertions, 13 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 2c8ba541d8..5ab52b9fe1 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -689,21 +689,21 @@ bool player_tracer( zap_type ztype, int power, bolt &pbolt, int range)
     if (range > 0)
         pbolt.rangeMax = range;
 
-    pbolt.is_tracer     = true;
-    pbolt.source_x      = you.x_pos;
-    pbolt.source_y      = you.y_pos;
-    pbolt.can_see_invis = player_see_invis();
-    pbolt.smart_monster = true;
-    pbolt.attitude      = ATT_FRIENDLY;
+    pbolt.is_tracer      = true;
+    pbolt.source_x       = you.x_pos;
+    pbolt.source_y       = you.y_pos;
+    pbolt.can_see_invis  = player_see_invis();
+    pbolt.smart_monster  = true;
+    pbolt.attitude       = ATT_FRIENDLY;
 
     // Init tracer variables.
-    pbolt.foe_count     = pbolt.fr_count = 0;
-    pbolt.foe_power     = pbolt.fr_power = 0;
-    pbolt.fr_helped     = pbolt.fr_hurt  = 0;
-    pbolt.foe_helped    = pbolt.foe_hurt = 0;
-    pbolt.foe_ratio     = 100;
-    pbolt.beam_cancelled= false;
-    pbolt.dont_stop_foe = pbolt.dont_stop_fr = false;
+    pbolt.foe_count      = pbolt.fr_count = 0;
+    pbolt.foe_power      = pbolt.fr_power = 0;
+    pbolt.fr_helped      = pbolt.fr_hurt  = 0;
+    pbolt.foe_helped     = pbolt.foe_hurt = 0;
+    pbolt.foe_ratio      = 100;
+    pbolt.beam_cancelled = false;
+    pbolt.dont_stop_foe  = pbolt.dont_stop_fr = pbolt.dont_stop_player = false;
 
     fire_beam(pbolt);