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.27 by root, Mon Sep 29 09:04:51 2008 UTC vs.
Revision 1.43 by root, Fri Jul 2 17:43:16 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
26#include <util.h>
25#include <random_map.h> 27#include <random_map.h>
26#include <rproto.h> 28#include <rproto.h>
27 29
28/* Put in the walls and autojoin them. */ 30/* Put in the walls and autojoin them. */
29 31
30/* given a layout and a coordinate, tell me which squares up/down/right/left 32/* given a maze and a coordinate, tell me which squares up/down/right/left
31 are occupied. */ 33 are occupied. */
32int 34int
33surround_flag (char **layout, int i, int j, random_map_params *RP) 35surround_flag (const layout &maze, int i, int j)
34{ 36{
35 /* 1 = wall to left, 37 /* 1 = wall to left,
36 2 = wall to right, 38 2 = wall to right,
37 4 = wall above 39 4 = wall above
38 8 = wall below */ 40 8 = wall below */
39 int surround_index = 0; 41 int surround_index = 0;
40 42
41 if ((i > 0) && layout[i - 1][j] != 0) 43 if (i > 0 && maze[i - 1][j] != 0) surround_index |= 1;
42 surround_index |= 1; 44 if (i < maze.w - 1 && maze[i + 1][j] != 0) surround_index |= 2;
43 if ((i < RP->Xsize - 1) && layout[i + 1][j] != 0) 45 if (j > 0 && maze[i][j - 1] != 0) surround_index |= 4;
44 surround_index |= 2; 46 if (j < maze.h - 1 && maze[i][j + 1] != 0) surround_index |= 8;
45 if ((j > 0) && layout[i][j - 1] != 0) 47
46 surround_index |= 4;
47 if ((j < RP->Ysize - 1) && layout[i][j + 1] != 0)
48 surround_index |= 8;
49 return surround_index; 48 return surround_index;
50} 49}
51 50
52
53/* like surround_flag, but only walls count. 51/* like surround_flag, but only walls count. */
54 */
55
56int 52int
57surround_flag2 (char **layout, int i, int j, random_map_params *RP) 53surround_flag2 (const layout &maze, int i, int j)
58{ 54{
59 /* 1 = wall to left, 55 /* 1 = wall to left,
60 2 = wall to right, 56 2 = wall to right,
61 4 = wall above 57 4 = wall above
62 8 = wall below */ 58 8 = wall below */
63 int surround_index = 0; 59 int surround_index = 0;
64 60
65 if ((i > 0) && layout[i - 1][j] == '#') 61 if (i > 0 && maze[i - 1][j] == '#') surround_index |= 1;
66 surround_index |= 1; 62 if (i < maze.w - 1 && maze[i + 1][j] == '#') surround_index |= 2;
67 if ((i < RP->Xsize - 1) && layout[i + 1][j] == '#') 63 if (j > 0 && maze[i][j - 1] == '#') surround_index |= 4;
68 surround_index |= 2; 64 if (j < maze.h - 1 && maze[i][j + 1] == '#') surround_index |= 8;
69 if ((j > 0) && layout[i][j - 1] == '#') 65
70 surround_index |= 4;
71 if ((j < RP->Ysize - 1) && layout[i][j + 1] == '#')
72 surround_index |= 8;
73 return surround_index; 66 return surround_index;
74} 67}
75 68
76
77/* like surround_flag, except it checks a map, not a layout. 69/* like surround_flag, except it checks a map, not a maze.
78 * Since this is part of the random map code, presumption 70 * Since this is part of the random map code, presumption
79 * is that this is not a tiled map. 71 * is that this is not a tiled map.
80 * What is considered blocking and not is somewhat hard coded. 72 * What is considered blocking and not is somewhat hard coded.
81 */ 73 */
82int 74int
83surround_flag3 (maptile *map, sint16 i, sint16 j, random_map_params *RP) 75surround_flag3 (maptile *map, int i, int j)
84{ 76{
85 /* 77 /*
86 * 1 = blocked to left, 78 * 1 = blocked to left,
87 * 2 = blocked to right, 79 * 2 = blocked to right,
88 * 4 = blocked above 80 * 4 = blocked above
89 * 8 = blocked below 81 * 8 = blocked below
90 */ 82 */
91
92 int surround_index = 0; 83 int surround_index = 0;
93 84
94 // don't forget to update the mapspace! 85 // don't forget to update the mapspace!
95 if (i > 0) map->at (i - 1, j ).update (); 86 if (i > 0) map->at (i - 1, j ).update ();
96 if (i < RP->Xsize - 1) map->at (i + 1, j ).update (); 87 if (i < map->width - 1) map->at (i + 1, j ).update ();
97 if (j > 0) map->at (i , j - 1).update (); 88 if (j > 0) map->at (i , j - 1).update ();
98 if (j < RP->Ysize - 1) map->at (i , j + 1).update (); 89 if (j < map->height - 1) map->at (i , j + 1).update ();
99 90
100 if ((i > 0) && (GET_MAP_MOVE_BLOCK (map, i - 1, j) & MOVE_WALK)) 91 if (i > 0 && (GET_MAP_MOVE_BLOCK (map, i - 1, j) & MOVE_WALK)) surround_index |= 1;
101 surround_index |= 1;
102 if ((i < RP->Xsize - 1) && (GET_MAP_MOVE_BLOCK (map, i + 1, j) & MOVE_WALK)) 92 if (i < map->width - 1 && (GET_MAP_MOVE_BLOCK (map, i + 1, j) & MOVE_WALK)) surround_index |= 2;
103 surround_index |= 2;
104 if ((j > 0) && (GET_MAP_MOVE_BLOCK (map, i, j - 1) & MOVE_WALK)) 93 if (j > 0 && (GET_MAP_MOVE_BLOCK (map, i, j - 1) & MOVE_WALK)) surround_index |= 4;
105 surround_index |= 4;
106 if ((j < RP->Ysize - 1) && (GET_MAP_MOVE_BLOCK (map, i, j + 1) & MOVE_WALK)) 94 if (j < map->height - 1 && (GET_MAP_MOVE_BLOCK (map, i, j + 1) & MOVE_WALK)) surround_index |= 8;
107 surround_index |= 8;
108 95
109 return surround_index; 96 return surround_index;
110} 97}
111 98
112/* like surround_flag2, except it checks a map, not a layout. */ 99/* like surround_flag2, except it checks a map, not a maze. */
113 100static int
114int
115surround_flag4 (maptile *map, int i, int j, random_map_params *RP) 101surround_flag4 (maptile *map, int i, int j)
116{ 102{
117 /* 1 = blocked to left, 103 /* 1 = blocked to left,
118 2 = blocked to right, 104 2 = blocked to right,
119 4 = blocked above 105 4 = blocked above
120 8 = blocked below */ 106 8 = blocked below */
121 int surround_index = 0; 107 int surround_index = 0;
122 108
123 if ((i > 0) && wall_blocked (map, i - 1, j)) 109 if (i > 0 && wall_blocked (map, i - 1, j)) surround_index |= 1;
124 surround_index |= 1; 110 if (i < map->width - 1 && wall_blocked (map, i + 1, j)) surround_index |= 2;
125 if ((i < RP->Xsize - 1) && wall_blocked (map, i + 1, j)) 111 if (j > 0 && wall_blocked (map, i, j - 1)) surround_index |= 4;
126 surround_index |= 2; 112 if (j < map->height - 1 && wall_blocked (map, i, j + 1)) surround_index |= 8;
127 if ((j > 0) && wall_blocked (map, i, j - 1))
128 surround_index |= 4;
129 if ((j < RP->Ysize - 1) && wall_blocked (map, i, j + 1))
130 surround_index |= 8;
131 113
132 return surround_index; 114 return surround_index;
133} 115}
134 116
135/* takes a map and a layout, and puts walls in the map (picked from
136 w_style) at '#' marks. */
137
138void
139make_map_walls (maptile *map, char **layout, char *w_style, random_map_params *RP)
140{
141 char styledirname[1024];
142 char stylefilepath[1024];
143 maptile *style_map = 0;
144 object *the_wall;
145
146 /* get the style map */
147 if (!strcmp (w_style, "none"))
148 return;
149 sprintf (styledirname, "%s", "/styles/wallstyles");
150 sprintf (stylefilepath, "%s/%s", styledirname, w_style);
151 style_map = find_style (styledirname, w_style, -1);
152 if (!style_map)
153 return;
154
155 /* fill up the map with the given floor style */
156 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
157 {
158 int i, j;
159 char *cp;
160 int joinedwalls = 0;
161 object *thiswall;
162
163 sprintf (RP->wall_name, "%s", &the_wall->arch->archname);
164 if ((cp = strchr (RP->wall_name, '_')) != NULL)
165 {
166 *cp = 0;
167 joinedwalls = 1;
168 }
169
170 for (i = 0; i < RP->Xsize; i++)
171 for (j = 0; j < RP->Ysize; j++)
172 {
173 if (layout[i][j] == '#')
174 {
175 if (joinedwalls)
176 thiswall = pick_joined_wall (the_wall, layout, i, j, RP);
177 else
178 thiswall = arch_to_object (the_wall->arch);
179 thiswall->x = i;
180 thiswall->y = j;
181 thiswall->move_block = MOVE_ALL;
182 insert_ob_in_map (thiswall, map, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
183 }
184 }
185 }
186}
187
188
189/* picks the right wall type for this square, to make it look nice, 117/* picks the right wall type for this square, to make it look nice,
190 and have everything nicely joined. It uses the layout. */ 118 and have everything nicely joined. It uses the maze. */
191 119static object *
192object *
193pick_joined_wall (object *the_wall, char **layout, int i, int j, random_map_params *RP) 120pick_joined_wall (object *the_wall, const layout &maze, int i, int j, random_map_params *RP)
194{ 121{
195 /* 1 = wall to left, 122 /* 1 = wall to left,
196 2 = wall to right, 123 2 = wall to right,
197 4 = wall above 124 4 = wall above
198 8 = wall below */ 125 8 = wall below */
… …
217 wall_name[l] = 0; 144 wall_name[l] = 0;
218 break; 145 break;
219 } 146 }
220 } 147 }
221 148
222 surround_index = surround_flag2 (layout, i, j, RP);
223
224 switch (surround_index)
225 {
226 case 0:
227 strcat (wall_name, "_0"); 149 strcat (wall_name, "_");
228 break; 150 strcat (wall_name, wall_suffix [surround_flag2 (maze, i, j)]);
229 case 1: 151
230 strcat (wall_name, "_1_3");
231 break;
232 case 2:
233 strcat (wall_name, "_1_4");
234 break;
235 case 3:
236 strcat (wall_name, "_2_1_2");
237 break;
238 case 4:
239 strcat (wall_name, "_1_2");
240 break;
241 case 5:
242 strcat (wall_name, "_2_2_4");
243 break;
244 case 6:
245 strcat (wall_name, "_2_2_1");
246 break;
247 case 7:
248 strcat (wall_name, "_3_1");
249 break;
250 case 8:
251 strcat (wall_name, "_1_1");
252 break;
253 case 9:
254 strcat (wall_name, "_2_2_3");
255 break;
256 case 10:
257 strcat (wall_name, "_2_2_2");
258 break;
259 case 11:
260 strcat (wall_name, "_3_3");
261 break;
262 case 12:
263 strcat (wall_name, "_2_1_1");
264 break;
265 case 13:
266 strcat (wall_name, "_3_4");
267 break;
268 case 14:
269 strcat (wall_name, "_3_2");
270 break;
271 case 15:
272 strcat (wall_name, "_4");
273 break;
274 }
275 wall_arch = archetype::find (wall_name); 152 wall_arch = archetype::find (wall_name);
276 153
277 return wall_arch ? arch_to_object (wall_arch) : arch_to_object (the_wall->arch); 154 return wall_arch ? wall_arch->instance () : the_wall->arch->instance ();
278} 155}
279 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
177/* takes a map and a maze, and puts walls in the map (picked from
178 w_style) at '#' marks. */
179void
180make_map_walls (maptile *map, layout &maze, const char *w_style, const char *m_style, random_map_params *RP)
181{
182 object *the_wall;
183
184 /* get the style map */
185 if (!strcmp (w_style, "none"))
186 return;
187
188 maptile *style_map = find_style ("/styles/wallstyles", w_style, RP->difficulty);
189 if (!style_map)
190 return;
191
192 maptile *mining_map = m_style && *m_style
193 ? find_style ("/styles/miningstyles", m_style, RP->difficulty)
194 : 0;
195
196 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
197 {
198 // first pass, remove all "unreachable" (in-rock) walls
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
221 int joinedwalls = 0;
222
223 assign (RP->wall_name, the_wall->arch->archname);
224 if (char *cp = strchr (RP->wall_name, '_'))
225 {
226 *cp = 0;
227 joinedwalls = 1;
228 }
229
230 for (int i = 0; i < RP->Xsize; i++)
231 for (int j = 0; j < RP->Ysize; j++)
232 if (clean_maze [i][j] == '#')
233 {
234 object *thiswall = joinedwalls ? pick_joined_wall (the_wall, clean_maze, i, j, RP)
235 : the_wall->arch->instance ();
236
237 thiswall->move_block = MOVE_ALL;
238 map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
239
240 if (mining_map)
241 if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot)
242 map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
243 }
244 }
245}
280 246
281/* 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
282 * 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
283 * 1, it will go ahead and insert the wall into the map. If not, it 249 * 1, it will go ahead and insert the wall into the map. If not, it
284 * will only return the wall which would belong there, and doesn't 250 * will only return the wall which would belong there, and doesn't
285 * remove anything. It depends on the 251 * remove anything. It depends on the
286 * global, previously-set variable, "wall_name" 252 * global, previously-set variable, "wall_name"
287 */ 253 */
288
289object * 254object *
290retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP) 255retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP)
291{ 256{
292 /* 1 = wall to left, 257 /* 1 = wall to left,
293 * 2 = wall to right, 258 * 2 = wall to right,
… …
299 object *the_wall = 0; 264 object *the_wall = 0;
300 object *new_wall = 0; 265 object *new_wall = 0;
301 archetype *wall_arch = 0; 266 archetype *wall_arch = 0;
302 267
303 /* first find the wall */ 268 /* first find the wall */
304 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)
305 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)
306 break; 271 break;
307
308 272
309 /* 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
310 * signal that later. 274 * signal that later.
311 */ 275 */
312 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))
… …
329 RP->wall_name[l] = 0; 293 RP->wall_name[l] = 0;
330 break; 294 break;
331 } 295 }
332 } 296 }
333 297
334 surround_index = surround_flag4 (the_map, i, j, RP);
335 /* This would be a lot cleaner to just us a lookup table,
336 * eg, wall_suffix[surround_index]
337 */
338 switch (surround_index)
339 {
340 case 0:
341 strcat (RP->wall_name, "_0"); 298 strcat (RP->wall_name, "_");
342 break; 299 strcat (RP->wall_name, wall_suffix [surround_flag4 (the_map, i, j)]);
343 case 1:
344 strcat (RP->wall_name, "_1_3");
345 break;
346 case 2:
347 strcat (RP->wall_name, "_1_4");
348 break;
349 case 3:
350 strcat (RP->wall_name, "_2_1_2");
351 break;
352 case 4:
353 strcat (RP->wall_name, "_1_2");
354 break;
355 case 5:
356 strcat (RP->wall_name, "_2_2_4");
357 break;
358 case 6:
359 strcat (RP->wall_name, "_2_2_1");
360 break;
361 case 7:
362 strcat (RP->wall_name, "_3_1");
363 break;
364 case 8:
365 strcat (RP->wall_name, "_1_1");
366 break;
367 case 9:
368 strcat (RP->wall_name, "_2_2_3");
369 break;
370 case 10:
371 strcat (RP->wall_name, "_2_2_2");
372 break;
373 case 11:
374 strcat (RP->wall_name, "_3_3");
375 break;
376 case 12:
377 strcat (RP->wall_name, "_2_1_1");
378 break;
379 case 13:
380 strcat (RP->wall_name, "_3_4");
381 break;
382 case 14:
383 strcat (RP->wall_name, "_3_2");
384 break;
385 case 15:
386 strcat (RP->wall_name, "_4");
387 break;
388 }
389 300
390 wall_arch = archetype::find (RP->wall_name); 301 wall_arch = archetype::find (RP->wall_name);
391 302
392 if (!wall_arch) 303 if (!wall_arch)
393 { 304 {
394 new_wall = arch_to_object (wall_arch); 305 new_wall = wall_arch->instance ();
395 new_wall->x = i; 306 new_wall->x = i;
396 new_wall->y = j; 307 new_wall->y = j;
397 308
398 if (the_wall && the_wall->map) 309 if (the_wall && the_wall->map)
399 the_wall->destroy (true); 310 the_wall->destroy ();
400 311
401 the_wall->move_block = MOVE_ALL; 312 the_wall->move_block = MOVE_ALL;
402 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON); 313 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON);
403 } 314 }
404 315

Diff Legend

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