Fix shopping messages mentioning "0 gold piece", and fix reading

unidentified scrolls of immolation counting as attacking friends.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 8c4f65f536..5f86991643 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1840,8 +1840,8 @@ void bolt::affect_cell()
             }
         }
 
-        // Note that this can change the ray position
-        // and the solidity of the wall.
+        // Note that this can change the ray position and the solidity
+        // of the wall.
         hit_wall();
     }
 
@@ -4466,12 +4466,12 @@ void bolt::affect_monster(monsters* mon)
     {
         if (YOU_KILL(thrower) && final > 0)
         {
-            // It's not the player's fault if he didn't see the monster or
-            // the monster was caught in an unexpected blast of ?immolation.
+            // It's not the player's fault if he didn't see the monster
+            // or the monster was caught in an unexpected blast of
+            // ?immolation.
             const bool okay =
                 (!you.can_see(mon)
-                 || aux_source == "reading a scroll of immolation"
-                    && !effect_known);
+                    || aux_source == "scroll of immolation" && !effect_known);
 
             if (is_sanctuary(mon->pos()) || is_sanctuary(you.pos()))
                 remove_sanctuary(true);