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.23 by root, Sun Jul 1 05:00:19 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines