ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/wall.C
(Generate patch)

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.43 by root, Fri Jul 2 17:43:16 2010 UTC

… …
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <util.h>
26#include <random_map.h> 27#include <random_map.h>
27#include <rproto.h> 28#include <rproto.h>
28 29
29/* Put in the walls and autojoin them. */ 30/* Put in the walls and autojoin them. */
30 31
… …
37 2 = wall to right, 38 2 = wall to right,
38 4 = wall above 39 4 = wall above
39 8 = wall below */ 40 8 = wall below */
40 int surround_index = 0; 41 int surround_index = 0;
41 42
42 if (i > 0 && maze[i - 1][j] != 0) surround_index |= 1; 43 if (i > 0 && maze[i - 1][j] != 0) surround_index |= 1;
43 if (i < maze.w - 1 && maze[i + 1][j] != 0) surround_index |= 2; 44 if (i < maze.w - 1 && maze[i + 1][j] != 0) surround_index |= 2;
44 if (j > 0 && maze[i][j - 1] != 0) surround_index |= 4; 45 if (j > 0 && maze[i][j - 1] != 0) surround_index |= 4;
45 if (j < maze.h - 1 && maze[i][j + 1] != 0) surround_index |= 8; 46 if (j < maze.h - 1 && maze[i][j + 1] != 0) surround_index |= 8;
46 47
47 return surround_index; 48 return surround_index;
48} 49}
49 50
… …
55 2 = wall to right, 56 2 = wall to right,
56 4 = wall above 57 4 = wall above
57 8 = wall below */ 58 8 = wall below */
58 int surround_index = 0; 59 int surround_index = 0;
59 60
60 if (i > 0 && maze[i - 1][j] == '#') surround_index |= 1; 61 if (i > 0 && maze[i - 1][j] == '#') surround_index |= 1;
61 if (i < maze.w - 1 && maze[i + 1][j] == '#') surround_index |= 2; 62 if (i < maze.w - 1 && maze[i + 1][j] == '#') surround_index |= 2;
62 if (j > 0 && maze[i][j - 1] == '#') surround_index |= 4; 63 if (j > 0 && maze[i][j - 1] == '#') surround_index |= 4;
63 if (j < maze.h - 1 && maze[i][j + 1] == '#') surround_index |= 8; 64 if (j < maze.h - 1 && maze[i][j + 1] == '#') surround_index |= 8;
64 65
65 return surround_index; 66 return surround_index;
66} 67}
67 68
… …
151 wall_arch = archetype::find (wall_name); 152 wall_arch = archetype::find (wall_name);
152 153
153 return wall_arch ? wall_arch->instance () : the_wall->arch->instance (); 154 return wall_arch ? wall_arch->instance () : the_wall->arch->instance ();
154} 155}
155 156
157// checks whether the layout has a "reachable" space at a given point, i.e.
158// not a wall that is completely surrounded by walls.
159static bool inline
160is_visible (layout &maze, int i, int j)
161{
162 for (int dx = -1; dx <= 1; ++dx)
163 for (int dy = -1; dy <= 1; ++dy)
164 {
165 int x = i + dx;
166 int y = j + dy;
167
168 if (IN_RANGE_EXC (x, 0, maze.w)
169 && IN_RANGE_EXC (y, 0, maze.h)
170 && maze [x][y] != '#')
171 return true;
172 }
173
174 return false;
175}
176
156/* takes a map and a maze, and puts walls in the map (picked from 177/* takes a map and a maze, and puts walls in the map (picked from
157 w_style) at '#' marks. */ 178 w_style) at '#' marks. */
158void 179void
159make_map_walls (maptile *map, layout &maze, const char *w_style, const char *m_style, random_map_params *RP) 180make_map_walls (maptile *map, layout &maze, const char *w_style, const char *m_style, random_map_params *RP)
160{ 181{
… …
172 ? find_style ("/styles/miningstyles", m_style, RP->difficulty) 193 ? find_style ("/styles/miningstyles", m_style, RP->difficulty)
173 : 0; 194 : 0;
174 195
175 if ((the_wall = style_map->pick_random_object (rmg_rndm))) 196 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
176 { 197 {
177 int i, j; 198 // first pass, remove all "unreachable" (in-rock) walls
178 char *cp; 199 // and replace them by "blocked" spaces.
200
201 layout clean_maze (maze);
202
203 if (archetype *blocked = archetype::find ("blocked"))
204 for (int x = 0; x < maze.w; ++x)
205 for (int y = 0; y < maze.h; ++y)
206 if (maze [x][y] == '#' && !is_visible (maze, x, y))
207 {
208 clean_maze [x][y] = 'X';
209
210 // erase everything on this space ad replace it by blocked
211 mapspace &ms = map->at (x, y);
212
213 while (ms.top)
214 ms.top->destroy ();
215
216 map->insert (blocked->instance (), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
217 }
218
219 // second pass, add in walls
220
179 int joinedwalls = 0; 221 int joinedwalls = 0;
180 object *thiswall;
181 222
182 sprintf (RP->wall_name, "%s", &the_wall->arch->archname); 223 assign (RP->wall_name, the_wall->arch->archname);
183 if ((cp = strchr (RP->wall_name, '_')) != NULL) 224 if (char *cp = strchr (RP->wall_name, '_'))
184 { 225 {
185 *cp = 0; 226 *cp = 0;
186 joinedwalls = 1; 227 joinedwalls = 1;
187 } 228 }
188 229
189 for (i = 0; i < RP->Xsize; i++) 230 for (int i = 0; i < RP->Xsize; i++)
190 for (j = 0; j < RP->Ysize; j++) 231 for (int j = 0; j < RP->Ysize; j++)
191 {
192 if (maze[i][j] == '#') 232 if (clean_maze [i][j] == '#')
193 { 233 {
194 if (joinedwalls)
195 thiswall = pick_joined_wall (the_wall, maze, i, j, RP); 234 object *thiswall = joinedwalls ? pick_joined_wall (the_wall, clean_maze, i, j, RP)
196 else 235 : the_wall->arch->instance ();
197 thiswall = the_wall->arch->instance ();
198 236
199 thiswall->move_block = MOVE_ALL; 237 thiswall->move_block = MOVE_ALL;
200 map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON); 238 map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
201 239
202 if (mining_map) 240 if (mining_map)
203 if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot) 241 if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot)
204 map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON); 242 map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
205 } 243 }
206 }
207 } 244 }
208} 245}
209 246
210/* this takes a map, and changes an existing wall to match what's blocked 247/* this takes a map, and changes an existing wall to match what's blocked
211 * around it, counting only doors and walls as blocked. If insert_flag is 248 * around it, counting only doors and walls as blocked. If insert_flag is
… …
227 object *the_wall = 0; 264 object *the_wall = 0;
228 object *new_wall = 0; 265 object *new_wall = 0;
229 archetype *wall_arch = 0; 266 archetype *wall_arch = 0;
230 267
231 /* first find the wall */ 268 /* first find the wall */
232 for (the_wall = GET_MAP_OB (the_map, i, j); the_wall != NULL; the_wall = the_wall->above) 269 for (the_wall = GET_MAP_OB (the_map, i, j); the_wall; the_wall = the_wall->above)
233 if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER) 270 if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER)
234 break; 271 break;
235
236 272
237 /* if what we found is a door, don't remove it, set the_wall to NULL to 273 /* if what we found is a door, don't remove it, set the_wall to NULL to
238 * signal that later. 274 * signal that later.
239 */ 275 */
240 if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR)) 276 if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR))

Diff Legend

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