Add more minor cosmetic fixes, and make sure Burn/Freeze always annoys

the monster, for consistency with beams.


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

2 files changed, 14 insertions, 17 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 6e0b8d4838..a27fbbc1bc 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3871,7 +3871,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
         hurt_final -= random2(1 + mon->ac);
     }
 
-    if (hurt_final < 1)
+    if (hurt_final < 0)
         hurt_final = 0;
 
     const int raw_damage = hurt_final;
@@ -3963,7 +3963,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
         }
 
         // Don't annoy friendlies or good neutrals if the player's beam
-        // did no damage. Hostiles will still take umbrage.
+        // did no damage.  Hostiles will still take umbrage.
         if (hurt_final > 0 || !mons_wont_attack(mon) || !YOU_KILL(beam.thrower))
             behaviour_event(mon, ME_ANNOY, _beam_source(beam) );
     }
@@ -4014,7 +4014,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
 
     conduct.enabled = true;
 
-    // the beam hit.
+    // The beam hit.
     if (mons_near(mon))
     {
         mprf("The %s %s %s.",
@@ -4025,8 +4025,8 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
     }
     else
     {
-        // the player might hear something,
-        // if _they_ fired a missile (not beam)
+        // The player might hear something, if _they_ fired a missile
+        // (not beam).
         if (!silenced(you.x_pos, you.y_pos) && beam.flavour == BEAM_MISSILE
             && YOU_KILL(beam.thrower))
         {
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index ca94362bf3..126da2ee42 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1208,21 +1208,18 @@ char burn_freeze(int pow, beam_type flavour)
     if (flavour != BEAM_MISSILE)
         hurted = mons_adjust_flavoured(monster, beam, hurted);
 
-    if (hurted)
-    {
-        behaviour_event(monster, ME_ANNOY, MHITYOU);
+    behaviour_event(monster, ME_ANNOY, MHITYOU);
 
-        if (mons_friendly(monster))
-            did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
-        else if (mons_neutral(monster))
-            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
+    if (mons_friendly(monster))
+        did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
+    else if (mons_neutral(monster))
+        did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
 
-        if (is_unchivalric_attack(&you, monster, monster))
-            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);
+    if (is_unchivalric_attack(&you, monster, monster))
+        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);
 
-        if (mons_is_holy(monster))
-            did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);
-    }
+    if (mons_is_holy(monster))
+        did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);
 
     if (hurted)
     {