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.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.31 by root, Fri Nov 6 13:03:34 2009 UTC

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

Diff Legend

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