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

Comparing deliantra/server/random_maps/wall.C (file contents):
Revision 1.40 by root, Fri Jul 2 16:36:56 2010 UTC vs.
Revision 1.49 by root, Mon Oct 29 23:55:54 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
+#include <util.h>
-#include <random_map.h>
+#include <rmg.h>
 #include <rproto.h>
 /*  Put in the walls and autojoin them.  */
 /* given a maze and a coordinate, tell me which squares up/down/right/left
      2 = wall to right,
      4 = wall above
      8 = wall below */
   int surround_index = 0;
-  if (i >     0 && maze[i - 1][j] != 0) surround_index |= 1;
+  if (i >          0 && maze[i - 1][j] != 0) surround_index |= 1;
   if (i < maze.w - 1 && maze[i + 1][j] != 0) surround_index |= 2;
-  if (j >     0 && maze[i][j - 1] != 0) surround_index |= 4;
+  if (j >          0 && maze[i][j - 1] != 0) surround_index |= 4;
   if (j < maze.h - 1 && maze[i][j + 1] != 0) surround_index |= 8;
   return surround_index;
 }
      2 = wall to right,
      4 = wall above
      8 = wall below */
   int surround_index = 0;
-  if (i >     0 && maze[i - 1][j] == '#') surround_index |= 1;
+  if (i >          0 && maze[i - 1][j] == '#') surround_index |= 1;
   if (i < maze.w - 1 && maze[i + 1][j] == '#') surround_index |= 2;
-  if (j >     0 && maze[i][j - 1] == '#') surround_index |= 4;
+  if (j >          0 && maze[i][j - 1] == '#') surround_index |= 4;
   if (j < maze.h - 1 && maze[i][j + 1] == '#') surround_index |= 8;
   return surround_index;
 }
 /* picks the right wall type for this square, to make it look nice,
         and have everything nicely joined.  It uses the maze.  */
 static object *
 pick_joined_wall (object *the_wall, const layout &maze, int i, int j, random_map_params *RP)
 {
-  /* 1 = wall to left,
-     2 = wall to right,
-     4 = wall above
-     8 = wall below */
-  int surround_index = 0;
   int l;
   char wall_name[1024];
   archetype *wall_arch = 0;
   assign (wall_name, the_wall->arch->archname);
   wall_arch = archetype::find (wall_name);
   return wall_arch ? wall_arch->instance () : the_wall->arch->instance ();
 }
+// checks whether the layout has a "reachable" space at a given point, i.e.
+// not a wall that is completely surrounded by walls.
+static bool inline
+is_visible (layout &maze, int i, int j)
+{
+  for (int dx = -1; dx <= 1; ++dx)
+    for (int dy = -1; dy <= 1; ++dy)
+      {
+        int x = i + dx;
+        int y = j + dy;
+        if (IN_RANGE_EXC (x, 0, maze.w)
+            && IN_RANGE_EXC (y, 0, maze.h)
+            && maze [x][y] != '#')
+          return true;
+      }
+  return false;
+}
 /* takes a map and a maze, and puts walls in the map (picked from
         w_style) at '#' marks. */
 void
 make_map_walls (maptile *map, layout &maze, const char *w_style, const char *m_style, random_map_params *RP)
 {
       ? find_style ("/styles/miningstyles", m_style, RP->difficulty)
       : 0;
   if ((the_wall = style_map->pick_random_object (rmg_rndm)))
     {
-      int i, j;
+      // first pass, remove all "unreachable" (in-rock) walls
-      char *cp;
+      // and replace them by "blocked" spaces.
+      layout clean_maze (maze);
+      if (archetype *blocked = archetype::find ("blocked"))
+        for (int x = 0; x < maze.w; ++x)
+          for (int y = 0; y < maze.h; ++y)
+            if (maze [x][y] == '#' && !is_visible (maze, x, y))
+              {
+                clean_maze [x][y] = 'X';
+                // erase everything on this space ad replace it by blocked
+                mapspace &ms = map->at (x, y);
+                while (ms.top)
+                  ms.top->destroy ();
+                map->insert (blocked->instance (), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
+              }
+      // second pass, add in walls
       int joinedwalls = 0;
-      object *thiswall;
-      sprintf (RP->wall_name, "%s", &the_wall->arch->archname);
+      assign (RP->wall_name, the_wall->arch->archname);
-      if ((cp = strchr (RP->wall_name, '_')) != NULL)
+      if (char *cp = strchr (RP->wall_name, '_'))
         {
           *cp = 0;
           joinedwalls = 1;
         }
-      for (i = 0; i < RP->Xsize; i++)
+      for (int i = 0; i < RP->Xsize; i++)
-        for (j = 0; j < RP->Ysize; j++)
+        for (int j = 0; j < RP->Ysize; j++)
-          {
-            if (maze[i][j] == '#')
+          if (clean_maze [i][j] == '#')
-              {
+            {
-                if (joinedwalls)
-                  thiswall = pick_joined_wall (the_wall, maze, i, j, RP);
+              object *thiswall = joinedwalls ? pick_joined_wall (the_wall, clean_maze, i, j, RP)
-                else
+                                             : the_wall->arch->instance ();
-                  thiswall = the_wall->arch->instance ();
-                thiswall->move_block = MOVE_ALL;
+              thiswall->move_block = MOVE_ALL;
-                map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
+              map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
-                if (mining_map)
+              if (mining_map)
-                  if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot)
+                if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot)
-                    map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
+                  map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
-              }
+            }
-          }
     }
 }
 /* this takes a map, and changes an existing wall to match what's blocked
  * around it, counting only doors and walls as blocked.  If insert_flag is
  * global, previously-set variable, "wall_name"
  */
 object *
 retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP)
 {
-  /* 1 = wall to left,
-   * 2 = wall to right,
-   * 4 = wall above
-   * 8 = wall below
-   */
-  int surround_index = 0;
   int l;
   object *the_wall = 0;
   object *new_wall = 0;
   archetype *wall_arch = 0;
   /* first find the wall */
-  for (the_wall = GET_MAP_OB (the_map, i, j); the_wall != NULL; the_wall = the_wall->above)
+  for (the_wall = GET_MAP_OB (the_map, i, j); the_wall; the_wall = the_wall->above)
     if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER)
       break;
   /* if what we found is a door, don't remove it, set the_wall to NULL to
    * signal that later.
    */
   if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR))
     {
       new_wall = wall_arch->instance ();
       new_wall->x = i;
       new_wall->y = j;
-      if (the_wall && the_wall->map)
+      if (the_wall->map)
         the_wall->destroy ();
       the_wall->move_block = MOVE_ALL;
       insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON);
     }

Diff Legend

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

Comparing deliantra/server/random_maps/wall.C (file contents): Revision 1.40 by root, Fri Jul 2 16:36:56 2010 UTC vs. Revision 1.49 by root, Mon Oct 29 23:55:54 2012 UTC

Diff Legend

Comparing deliantra/server/random_maps/wall.C (file contents):
Revision 1.40 by root, Fri Jul 2 16:36:56 2010 UTC vs.
Revision 1.49 by root, Mon Oct 29 23:55:54 2012 UTC