[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/wall.C (file contents):
Revision 1.41 by root, Fri Jul 2 17:18:04 2010 UTC vs.
Revision 1.43 by root, Fri Jul 2 17:43:16 2010 UTC

  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
+#include <util.h>
 #include <random_map.h>
 #include <rproto.h>
 /*  Put in the walls and autojoin them.  */
   wall_arch = archetype::find (wall_name);
   return wall_arch ? wall_arch->instance () : the_wall->arch->instance ();
 }
-// checks whether the layout has a "reachable" wall at a givne point, i.e.
+// checks whether the layout has a "reachable" space at a given point, i.e.
-// a wall that is not completely surrounded by walls.
+// not a wall that is completely surrounded by walls.
 static bool inline
 is_visible (layout &maze, int i, int j)
 {
-  int cnt = 0;
   for (int dx = -1; dx <= 1; ++dx)
     for (int dy = -1; dy <= 1; ++dy)
       {
         int x = i + dx;
         int y = j + dy;
-        cnt += x < 0 || x >= maze.w
+        if (IN_RANGE_EXC (x, 0, maze.w)
-            || y < 0 || y >= maze.h
+            && IN_RANGE_EXC (y, 0, maze.h)
-            || maze [x][y] == '#';
+            && maze [x][y] != '#')
+          return true;
       }
-  return cnt != 9;
+  return false;
 }
 /* takes a map and a maze, and puts walls in the map (picked from
         w_style) at '#' marks. */
 void

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines