From 57f3e71ae59d5e4830bdf787d9f2d5e9d5fe8fc8 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 25 Sep 2008 17:30:31 +0000
Subject: In ouch(), use NON_MONSTER instead of 0 as the index for non-monster
 attacks, so as to avoid overlap with the first monster on the level.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6985 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/cloud.cc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'crawl-ref/source/cloud.cc')

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index a085f75d79..5dd3ec65f8 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -479,17 +479,17 @@ void in_a_cloud()
 
             hurted -= random2(player_AC());
 
-            if (hurted < 1)
+            if (hurted < 0)
                 hurted = 0;
             else
-                ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
+                ouch(hurted, cl, KILLED_BY_CLOUD, "flame");
         }
         else
         {
             canned_msg(MSG_YOU_RESIST);
             hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
             hurted /= (1 + resist * resist);
-            ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
+            ouch(hurted, cl, KILLED_BY_CLOUD, "flame");
         }
         expose_player_to_element(BEAM_FIRE, 7);
         break;
@@ -504,8 +504,8 @@ void in_a_cloud()
         if (hurted < 1)
             hurted = 0;
         else
-            ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
-                    "noxious fumes" );
+            ouch((hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
+                 "noxious fumes");
 
         if (1 + random2(27) >= you.experience_level)
         {
@@ -530,14 +530,14 @@ void in_a_cloud()
             if (hurted < 0)
                 hurted = 0;
 
-            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
+            ouch(hurted, cl, KILLED_BY_CLOUD, "freezing vapour");
         }
         else
         {
             canned_msg(MSG_YOU_RESIST);
             hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
             hurted /= (1 + resist * resist);
-            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
+            ouch(hurted, cl, KILLED_BY_CLOUD, "freezing vapour");
         }
         expose_player_to_element(BEAM_COLD, 7);
         break;
@@ -547,8 +547,8 @@ void in_a_cloud()
         mpr("You are engulfed in poison gas!");
         if (!player_res_poison())
         {
-            ouch( (random2(10) * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
-                  "poison gas" );
+            ouch((random2(10) * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
+                 "poison gas");
             poison_player(1);
         }
         break;
@@ -581,8 +581,8 @@ void in_a_cloud()
         if (hurted < 0)
             hurted = 0;
 
-        ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
-              "steam" );
+        ouch((hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
+             "steam");
         break;
     }
 
@@ -599,7 +599,7 @@ void in_a_cloud()
         if (hurted < 0)
             hurted = 0;
 
-        ouch( hurted, cl, KILLED_BY_CLOUD, "foul pestilence" );
+        ouch(hurted, cl, KILLED_BY_CLOUD, "foul pestilence");
         potion_effect(POT_SLOWING, 5);
 
         if (you.hp_max > 4 && coinflip())
-- 
cgit v1.2.3-54-g00ecf