Apply Horst von Brand's (first) patch 1887488: gcc-4.3 compile failures.

I'm not sure what to do about the rest of that tracker item.


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

1 files changed, 6 insertions, 3 deletions

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 3aa74613df..f98eabe7aa 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -13,6 +13,9 @@
  */
 
 #include "AppHdr.h"
+
+#include <algorithm>
+
 #include "externs.h"
 
 #include "branch.h"
@@ -89,7 +92,7 @@ static int spread_cloud(const cloud_struct &cloud)
             const int x = cloud.x + xi;
             const int y = cloud.y + yi;
 
-            if (!in_bounds(x, y) 
+            if (!in_bounds(x, y)
                     || env.cgrid[x][y] != EMPTY_CLOUD
                     || grid_is_solid(grd[x][y]))
                 continue;
@@ -174,7 +177,7 @@ void delete_cloud( int cloud )
 }
 
 // The current use of this function is for shifting in the abyss, so
-// that clouds get moved along with the rest of the map. 
+// that clouds get moved along with the rest of the map.
 void move_cloud( int cloud, int new_x, int new_y )
 {
     if (cloud != EMPTY_CLOUD)
@@ -246,7 +249,7 @@ void place_cloud(cloud_type cl_type, int ctarget_x,
     unsigned char spread_rate = actual_spread_rate( cl_type, _spread_rate );
 
     // too many clouds
-    if (env.cloud_no >= MAX_CLOUDS) 
+    if (env.cloud_no >= MAX_CLOUDS)
     {
         // default to random in case there's no low quality clouds
         int cl_del = random2( MAX_CLOUDS );