Consolidate beam and cloud handling routines a bit, and allow clouds to

destroy items on the floor where applicable.  Also allow grey smoke as a 
random potion effect from Evaporate.


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

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 182ce92ae1..885f9aaeae 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -22,6 +22,7 @@
 #include "cloud.h"
 #include "mapmark.h"
 #include "misc.h"
+#include "ouch.h"
 #include "place.h"
 #include "stuff.h"
 #include "terrain.h"
@@ -152,7 +153,10 @@ void manage_clouds(void)
             dissipate *= 4;
         }
 
-        dissipate_cloud( cc, env.cloud[cc], dissipate );
+        expose_items_to_element(cloud2beam(env.cloud[cc].type),
+                                env.cloud[cc].x, env.cloud[cc].y);
+
+        dissipate_cloud(cc, env.cloud[cc], dissipate);
     }
 
     return;
@@ -516,5 +520,5 @@ fog_machine_data fogs_lab_type(int level_number)
 
 killer_type cloud_struct::beam_thrower() const
 {
-    return (whose == KC_YOU? KILL_YOU_MISSILE : KILL_MON_MISSILE);
+    return (whose == KC_YOU ? KILL_YOU_MISSILE : KILL_MON_MISSILE);
 }