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.38 by root, Fri Jul 2 15:03:57 2010 UTC vs.
Revision 1.49 by root, Mon Oct 29 23:55:54 2012 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
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 <rmg.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
31/* given a maze 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
… …
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
… …
116/* 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,
117 and have everything nicely joined. It uses the maze. */ 118 and have everything nicely joined. It uses the maze. */
118static object * 119static object *
119pick_joined_wall (object *the_wall, const layout &maze, 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)
120{ 121{
121 /* 1 = wall to left,
122 2 = wall to right,
123 4 = wall above
124 8 = wall below */
125 int surround_index = 0;
126 int l; 122 int l;
127 char wall_name[1024]; 123 char wall_name[1024];
128 archetype *wall_arch = 0; 124 archetype *wall_arch = 0;
129 125
130 assign (wall_name, the_wall->arch->archname); 126 assign (wall_name, the_wall->arch->archname);
… …
143 wall_name[l] = 0; 139 wall_name[l] = 0;
144 break; 140 break;
145 } 141 }
146 } 142 }
147 143
148 surround_index = surround_flag2 (maze, i, j);
149
150 switch (surround_index)
151 {
152 case 0:
153 strcat (wall_name, "_0"); 144 strcat (wall_name, "_");
154 break; 145 strcat (wall_name, wall_suffix [surround_flag2 (maze, i, j)]);
155 case 1: 146
156 strcat (wall_name, "_1_3");
157 break;
158 case 2:
159 strcat (wall_name, "_1_4");
160 break;
161 case 3:
162 strcat (wall_name, "_2_1_2");
163 break;
164 case 4:
165 strcat (wall_name, "_1_2");
166 break;
167 case 5:
168 strcat (wall_name, "_2_2_4");
169 break;
170 case 6:
171 strcat (wall_name, "_2_2_1");
172 break;
173 case 7:
174 strcat (wall_name, "_3_1");
175 break;
176 case 8:
177 strcat (wall_name, "_1_1");
178 break;
179 case 9:
180 strcat (wall_name, "_2_2_3");
181 break;
182 case 10:
183 strcat (wall_name, "_2_2_2");
184 break;
185 case 11:
186 strcat (wall_name, "_3_3");
187 break;
188 case 12:
189 strcat (wall_name, "_2_1_1");
190 break;
191 case 13:
192 strcat (wall_name, "_3_4");
193 break;
194 case 14:
195 strcat (wall_name, "_3_2");
196 break;
197 case 15:
198 strcat (wall_name, "_4");
199 break;
200 }
201 wall_arch = archetype::find (wall_name); 147 wall_arch = archetype::find (wall_name);
202 148
203 return wall_arch ? wall_arch->instance () : the_wall->arch->instance (); 149 return wall_arch ? wall_arch->instance () : the_wall->arch->instance ();
150}
151
152// checks whether the layout has a "reachable" space at a given point, i.e.
153// not a wall that is completely surrounded by walls.
154static bool inline
155is_visible (layout &maze, int i, int j)
156{
157 for (int dx = -1; dx <= 1; ++dx)
158 for (int dy = -1; dy <= 1; ++dy)
159 {
160 int x = i + dx;
161 int y = j + dy;
162
163 if (IN_RANGE_EXC (x, 0, maze.w)
164 && IN_RANGE_EXC (y, 0, maze.h)
165 && maze [x][y] != '#')
166 return true;
167 }
168
169 return false;
204} 170}
205 171
206/* takes a map and a maze, and puts walls in the map (picked from 172/* takes a map and a maze, and puts walls in the map (picked from
207 w_style) at '#' marks. */ 173 w_style) at '#' marks. */
208void 174void
… …
222 ? find_style ("/styles/miningstyles", m_style, RP->difficulty) 188 ? find_style ("/styles/miningstyles", m_style, RP->difficulty)
223 : 0; 189 : 0;
224 190
225 if ((the_wall = style_map->pick_random_object (rmg_rndm))) 191 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
226 { 192 {
227 int i, j; 193 // first pass, remove all "unreachable" (in-rock) walls
228 char *cp; 194 // and replace them by "blocked" spaces.
195
196 layout clean_maze (maze);
197
198 if (archetype *blocked = archetype::find ("blocked"))
199 for (int x = 0; x < maze.w; ++x)
200 for (int y = 0; y < maze.h; ++y)
201 if (maze [x][y] == '#' && !is_visible (maze, x, y))
202 {
203 clean_maze [x][y] = 'X';
204
205 // erase everything on this space ad replace it by blocked
206 mapspace &ms = map->at (x, y);
207
208 while (ms.top)
209 ms.top->destroy ();
210
211 map->insert (blocked->instance (), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
212 }
213
214 // second pass, add in walls
215
229 int joinedwalls = 0; 216 int joinedwalls = 0;
230 object *thiswall;
231 217
232 sprintf (RP->wall_name, "%s", &the_wall->arch->archname); 218 assign (RP->wall_name, the_wall->arch->archname);
233 if ((cp = strchr (RP->wall_name, '_')) != NULL) 219 if (char *cp = strchr (RP->wall_name, '_'))
234 { 220 {
235 *cp = 0; 221 *cp = 0;
236 joinedwalls = 1; 222 joinedwalls = 1;
237 } 223 }
238 224
239 for (i = 0; i < RP->Xsize; i++) 225 for (int i = 0; i < RP->Xsize; i++)
240 for (j = 0; j < RP->Ysize; j++) 226 for (int j = 0; j < RP->Ysize; j++)
241 {
242 if (maze[i][j] == '#') 227 if (clean_maze [i][j] == '#')
243 { 228 {
244 if (joinedwalls)
245 thiswall = pick_joined_wall (the_wall, maze, i, j, RP); 229 object *thiswall = joinedwalls ? pick_joined_wall (the_wall, clean_maze, i, j, RP)
246 else 230 : the_wall->arch->instance ();
247 thiswall = the_wall->arch->instance ();
248 231
249 thiswall->move_block = MOVE_ALL; 232 thiswall->move_block = MOVE_ALL;
250 map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON); 233 map->insert (thiswall, i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
251 234
252 if (mining_map) 235 if (mining_map)
253 if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot) 236 if (object *vein = mining_map->at (rmg_rndm (mining_map->width), rmg_rndm (mining_map->height)).bot)
254 map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON); 237 map->insert (vein->clone (), i, j, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
255 } 238 }
256 }
257 } 239 }
258} 240}
259 241
260/* this takes a map, and changes an existing wall to match what's blocked 242/* this takes a map, and changes an existing wall to match what's blocked
261 * around it, counting only doors and walls as blocked. If insert_flag is 243 * around it, counting only doors and walls as blocked. If insert_flag is
… …
265 * global, previously-set variable, "wall_name" 247 * global, previously-set variable, "wall_name"
266 */ 248 */
267object * 249object *
268retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP) 250retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP)
269{ 251{
270 /* 1 = wall to left,
271 * 2 = wall to right,
272 * 4 = wall above
273 * 8 = wall below
274 */
275 int surround_index = 0;
276 int l; 252 int l;
277 object *the_wall = 0; 253 object *the_wall = 0;
278 object *new_wall = 0; 254 object *new_wall = 0;
279 archetype *wall_arch = 0; 255 archetype *wall_arch = 0;
280 256
281 /* first find the wall */ 257 /* first find the wall */
282 for (the_wall = GET_MAP_OB (the_map, i, j); the_wall != NULL; the_wall = the_wall->above) 258 for (the_wall = GET_MAP_OB (the_map, i, j); the_wall; the_wall = the_wall->above)
283 if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER) 259 if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER)
284 break; 260 break;
285
286 261
287 /* if what we found is a door, don't remove it, set the_wall to NULL to 262 /* if what we found is a door, don't remove it, set the_wall to NULL to
288 * signal that later. 263 * signal that later.
289 */ 264 */
290 if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR)) 265 if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR))
… …
307 RP->wall_name[l] = 0; 282 RP->wall_name[l] = 0;
308 break; 283 break;
309 } 284 }
310 } 285 }
311 286
312 surround_index = surround_flag4 (the_map, i, j);
313 /* This would be a lot cleaner to just us a lookup table,
314 * eg, wall_suffix[surround_index]
315 */
316 switch (surround_index)
317 {
318 case 0:
319 strcat (RP->wall_name, "_0"); 287 strcat (RP->wall_name, "_");
320 break; 288 strcat (RP->wall_name, wall_suffix [surround_flag4 (the_map, i, j)]);
321 case 1:
322 strcat (RP->wall_name, "_1_3");
323 break;
324 case 2:
325 strcat (RP->wall_name, "_1_4");
326 break;
327 case 3:
328 strcat (RP->wall_name, "_2_1_2");
329 break;
330 case 4:
331 strcat (RP->wall_name, "_1_2");
332 break;
333 case 5:
334 strcat (RP->wall_name, "_2_2_4");
335 break;
336 case 6:
337 strcat (RP->wall_name, "_2_2_1");
338 break;
339 case 7:
340 strcat (RP->wall_name, "_3_1");
341 break;
342 case 8:
343 strcat (RP->wall_name, "_1_1");
344 break;
345 case 9:
346 strcat (RP->wall_name, "_2_2_3");
347 break;
348 case 10:
349 strcat (RP->wall_name, "_2_2_2");
350 break;
351 case 11:
352 strcat (RP->wall_name, "_3_3");
353 break;
354 case 12:
355 strcat (RP->wall_name, "_2_1_1");
356 break;
357 case 13:
358 strcat (RP->wall_name, "_3_4");
359 break;
360 case 14:
361 strcat (RP->wall_name, "_3_2");
362 break;
363 case 15:
364 strcat (RP->wall_name, "_4");
365 break;
366 }
367 289
368 wall_arch = archetype::find (RP->wall_name); 290 wall_arch = archetype::find (RP->wall_name);
369 291
370 if (!wall_arch) 292 if (!wall_arch)
371 { 293 {
372 new_wall = wall_arch->instance (); 294 new_wall = wall_arch->instance ();
373 new_wall->x = i; 295 new_wall->x = i;
374 new_wall->y = j; 296 new_wall->y = j;
375 297
376 if (the_wall && the_wall->map) 298 if (the_wall->map)
377 the_wall->destroy (); 299 the_wall->destroy ();
378 300
379 the_wall->move_block = MOVE_ALL; 301 the_wall->move_block = MOVE_ALL;
380 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON); 302 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON);
381 } 303 }

Diff Legend

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