From e1879031547aa6861a565563724d7308d02cc2f2 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 18 May 2009 20:58:14 +0000
Subject: 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
---
 crawl-ref/source/beam.cc     | 12 ++++++------
 crawl-ref/source/player.cc   |  1 +
 crawl-ref/source/religion.cc |  2 +-
 crawl-ref/source/shopping.cc | 28 ++++++++++++++--------------
 4 files changed, 22 insertions(+), 21 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);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ef4c97f985..54d9f6dd30 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3216,6 +3216,7 @@ void level_change(bool skip_attribute_increase)
                         "transforming into a vampire bat.", MSGCH_INTRINSIC_GAIN);
                 }
                 break;
+
             case SP_NAGA:
                 // lower because of HD raise -- bwr
                 // if (you.experience_level < 14)
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d7fb25671a..bc6affe8eb 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -6213,7 +6213,7 @@ bool god_hates_attacking_friend(god_type god, const actor *fr)
     if (!fr || fr->kill_alignment() != KC_FRIENDLY)
         return (false);
 
-    return god_hates_attacking_friend(god, fr->mons_species());
+    return (god_hates_attacking_friend(god, fr->mons_species()));
 }
 
 bool god_hates_attacking_friend(god_type god, int species)
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index aaa31a7b80..a93f00eacb 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -291,30 +291,30 @@ static bool _in_a_shop( int shopidx )
 
         if (!total_cost)
         {
-            snprintf( info, INFO_SIZE, "You have %d gold piece%s.", you.gold,
-                      you.gold > 1 ? "s" : "" );
+            snprintf(info, INFO_SIZE, "You have %d gold piece%s.", you.gold,
+                     you.gold != 1 ? "s" : "");
 
             textcolor(YELLOW);
         }
         else if (total_cost > you.gold)
         {
-            snprintf( info, INFO_SIZE, "You now have %d gold piece%s. "
-                            "You are short %d gold piece%s for the purchase.",
-                      you.gold,
-                      you.gold > 1 ? "s" : "",
-                      total_cost - you.gold,
-                      (total_cost - you.gold > 1) ? "s" : "" );
+            snprintf(info, INFO_SIZE, "You now have %d gold piece%s. "
+                           "You are short %d gold piece%s for the purchase.",
+                     you.gold,
+                     you.gold != 1 ? "s" : "",
+                     total_cost - you.gold,
+                     (total_cost - you.gold != 1) ? "s" : "");
 
             textcolor(LIGHTRED);
         }
         else
         {
-            snprintf( info, INFO_SIZE, "You now have %d gold piece%s. "
-                      "After the purchase, you will have %d gold piece%s.",
-                      you.gold,
-                      you.gold > 1 ? "s" : "",
-                      you.gold - total_cost,
-                      (you.gold - total_cost > 1) ? "s" : "" );
+            snprintf(info, INFO_SIZE, "You now have %d gold piece%s. "
+                     "After the purchase, you will have %d gold piece%s.",
+                     you.gold,
+                     you.gold != 1 ? "s" : "",
+                     you.gold - total_cost,
+                     (you.gold - total_cost != 1) ? "s" : "");
 
             textcolor(YELLOW);
         }
-- 
cgit v1.2.3-54-g00ecf