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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.18 by pippijn, Mon Jan 15 21:06:19 2007 UTC vs.
Revision 1.27 by elmex, Sun Apr 15 14:15:14 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* placing treasure in maps, where appropriate. */ 25/* placing treasure in maps, where appropriate. */
26
27
28 26
29#include <global.h> 27#include <global.h>
30#include <random_map.h> 28#include <random_map.h>
31#include <rproto.h> 29#include <rproto.h>
32 30
… …
43#define LAST_OPTION 64 /* set this to the last real option, for random */ 41#define LAST_OPTION 64 /* set this to the last real option, for random */
44 42
45#define NO_PASS_DOORS 0 43#define NO_PASS_DOORS 0
46#define PASS_DOORS 1 44#define PASS_DOORS 1
47 45
46/* a macro to get a strongly centered random distribution,
47 from 0 to x, centered at x/2 */
48static int
49bc_random (int x)
50{
51 return (rndm (x) + rndm (x) + rndm (x)) / 3;
52}
48 53
49/* returns true if square x,y has P_NO_PASS set, which is true for walls 54/* returns true if square x,y has P_NO_PASS set, which is true for walls
50 * and doors but not monsters. 55 * and doors but not monsters.
51 * This function is not map tile aware. 56 * This function is not map tile aware.
52 */ 57 */
53
54int 58int
55wall_blocked (maptile *m, int x, int y) 59wall_blocked (maptile *m, int x, int y)
56{ 60{
57 int r;
58
59 if (OUT_OF_REAL_MAP (m, x, y)) 61 if (OUT_OF_REAL_MAP (m, x, y))
60 return 1; 62 return 1;
63
64 m->at (x, y).update ();
61 r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT; 65 return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
62 return r;
63} 66}
64 67
65/* place treasures in the map, given the 68/* place treasures in the map, given the
66map, (required) 69map, (required)
67layout, (required) 70layout, (required)
68treasure style (may be empty or NULL, or "none" to cause no treasure.) 71treasure style (may be empty or NULL, or "none" to cause no treasure.)
69treasureoptions (may be 0 for random choices or positive) 72treasureoptions (may be 0 for random choices or positive)
70*/ 73*/
71
72void 74void
73place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP) 75place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP)
74{ 76{
75 char styledirname[1024]; 77 char styledirname[1024];
76 char stylefilepath[1024]; 78 char stylefilepath[1024];
… …
79 81
80 /* bail out if treasure isn't wanted. */ 82 /* bail out if treasure isn't wanted. */
81 if (treasure_style) 83 if (treasure_style)
82 if (!strcmp (treasure_style, "none")) 84 if (!strcmp (treasure_style, "none"))
83 return; 85 return;
86
84 if (treasureoptions <= 0) 87 if (treasureoptions <= 0)
85 treasureoptions = RANDOM () % (2 * LAST_OPTION); 88 treasureoptions = rndm (2 * LAST_OPTION);
86 89
87 /* filter out the mutually exclusive options */ 90 /* filter out the mutually exclusive options */
88 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 91 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
89 { 92 {
90 if (RANDOM () % 2) 93 if (rndm (2))
91 treasureoptions -= 1; 94 treasureoptions -= 1;
92 else 95 else
93 treasureoptions -= 2; 96 treasureoptions -= 2;
94 } 97 }
95 98
96 /* pick the number of treasures */ 99 /* pick the number of treasures */
97 if (treasureoptions & SPARSE) 100 if (treasureoptions & SPARSE)
98 num_treasures = BC_RANDOM (RP->total_map_hp / 600 + RP->difficulty / 2 + 1); 101 num_treasures = bc_random (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
99 else if (treasureoptions & RICH) 102 else if (treasureoptions & RICH)
100 num_treasures = BC_RANDOM (RP->total_map_hp / 150 + 2 * RP->difficulty + 1); 103 num_treasures = bc_random (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
101 else 104 else
102 num_treasures = BC_RANDOM (RP->total_map_hp / 300 + RP->difficulty + 1); 105 num_treasures = bc_random (RP->total_map_hp / 300 + RP->difficulty + 1);
103 106
104 if (num_treasures <= 0) 107 if (num_treasures <= 0)
105 return; 108 return;
106 109
107 /* get the style map */ 110 /* get the style map */
108 sprintf (styledirname, "%s", "/styles/treasurestyles"); 111 sprintf (styledirname, "%s", "/styles/treasurestyles");
109 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style); 112 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style);
110 style_map = find_style (styledirname, treasure_style, -1); 113 style_map = find_style (styledirname, treasure_style, -1);
114
115 if (!style_map)
116 {
117 LOG (llevError, "unable to load style map %s %s.\n", styledirname, treasure_style);
118 return;
119 }
111 120
112 /* all the treasure at one spot in the map. */ 121 /* all the treasure at one spot in the map. */
113 if (treasureoptions & CONCENTRATED) 122 if (treasureoptions & CONCENTRATED)
114 { 123 {
115 124
… …
158 167
159 i = j = -1; 168 i = j = -1;
160 tries = 0; 169 tries = 0;
161 while (i == -1 && tries < 100) 170 while (i == -1 && tries < 100)
162 { 171 {
163 i = RANDOM () % (RP->Xsize - 2) + 1; 172 i = rndm (RP->Xsize - 2) + 1;
164 j = RANDOM () % (RP->Ysize - 2) + 1; 173 j = rndm (RP->Ysize - 2) + 1;
165 find_enclosed_spot (map, &i, &j, RP); 174 find_enclosed_spot (map, &i, &j, RP);
166 if (wall_blocked (map, i, j)) 175 if (wall_blocked (map, i, j))
167 i = -1; 176 i = -1;
168 tries++; 177 tries++;
169 } 178 }
… …
185 { /* DIFFUSE treasure layout */ 194 { /* DIFFUSE treasure layout */
186 int ti, i, j; 195 int ti, i, j;
187 196
188 for (ti = 0; ti < num_treasures; ti++) 197 for (ti = 0; ti < num_treasures; ti++)
189 { 198 {
190 i = RANDOM () % (RP->Xsize - 2) + 1; 199 i = rndm (RP->Xsize - 2) + 1;
191 j = RANDOM () % (RP->Ysize - 2) + 1; 200 j = rndm (RP->Ysize - 2) + 1;
192 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 201 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
193 } 202 }
194 } 203 }
195} 204}
196 205
… …
230 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 239 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
231 240
232 if (tlist != NULL) 241 if (tlist != NULL)
233 for (ti = 0; ti < n_treasures; ti++) 242 for (ti = 0; ti < n_treasures; ti++)
234 { /* use the treasure list */ 243 { /* use the treasure list */
235 object *new_treasure = pick_random_object (style_map); 244 object *new_treasure = style_map->pick_random_object ();
236 245
237 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 246 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
238 } 247 }
239 else 248 else
240 { /* use the style map */ 249 { /* use the style map */
… …
255 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 264 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
256 object *the_trap; 265 object *the_trap;
257 266
258 if (trap_map) 267 if (trap_map)
259 { 268 {
260 the_trap = pick_random_object (trap_map); 269 the_trap = trap_map->pick_random_object ();
261 the_trap->stats.Cha = 10 + RP->difficulty; 270 the_trap->stats.Cha = 10 + RP->difficulty;
262 the_trap->level = BC_RANDOM ((3 * RP->difficulty) / 2); 271 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
263 if (the_trap) 272 if (the_trap)
264 { 273 {
265 object *new_trap; 274 object *new_trap;
266 275
267 new_trap = arch_to_object (the_trap->arch); 276 new_trap = arch_to_object (the_trap->arch);
… …
274 } 283 }
275 284
276 /* set the chest lock code, and call the keyplacer routine with 285 /* set the chest lock code, and call the keyplacer routine with
277 the lockcode. It's not worth bothering to lock the chest if 286 the lockcode. It's not worth bothering to lock the chest if
278 there's only 1 treasure.... */ 287 there's only 1 treasure.... */
279
280 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 288 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
281 { 289 {
282 char keybuf[1024]; 290 char keybuf[1024];
283 291
284 sprintf (keybuf, "%d", (int) RANDOM ()); 292 sprintf (keybuf, "%d", rndm (1000000000));
285 the_chest->slaying = keybuf; 293 the_chest->slaying = keybuf;
286 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 294 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP);
287 } 295 }
288 296
289 /* actually place the chest. */ 297 /* actually place the chest. */
… …
332 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1. 340 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
333 341
334 The idea is that you call keyplace on x,y where a door is, and it'll make 342 The idea is that you call keyplace on x,y where a door is, and it'll make
335 sure a key is placed on both sides of the door. 343 sure a key is placed on both sides of the door.
336*/ 344*/
337
338int 345int
339keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP) 346keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
340{ 347{
341 int i, j; 348 int i, j;
342 int kx, ky; 349 int kx = 0, ky = 0;
343 object *the_keymaster; /* the monster that gets the key. */ 350 object *the_keymaster; /* the monster that gets the key. */
344 object *the_key; 351 object *the_key;
345 352
346 /* get a key and set its keycode */ 353 /* get a key and set its keycode */
347 the_key = get_archetype ("key2"); 354 the_key = get_archetype ("key2");
… …
349 356
350 if (door_flag == PASS_DOORS) 357 if (door_flag == PASS_DOORS)
351 { 358 {
352 int tries = 0; 359 int tries = 0;
353 360
354 the_keymaster = NULL; 361 the_keymaster = 0;
355 while (tries < 15 && the_keymaster == NULL) 362 while (tries < 15 && !the_keymaster)
356 { 363 {
357 i = (RANDOM () % (RP->Xsize - 2)) + 1; 364 i = rndm (RP->Xsize - 2) + 1;
358 j = (RANDOM () % (RP->Ysize - 2)) + 1; 365 j = rndm (RP->Ysize - 2) + 1;
359 tries++; 366 tries++;
360 the_keymaster = find_closest_monster (map, i, j, RP); 367 the_keymaster = find_closest_monster (map, i, j, RP);
361 } 368 }
369
362 /* if we don't find a good keymaster, drop the key on the ground. */ 370 /* if we don't find a good keymaster, drop the key on the ground. */
363 if (the_keymaster == NULL) 371 if (!the_keymaster)
364 { 372 {
365 int freeindex; 373 int freeindex;
366 374
367 freeindex = -1; 375 freeindex = -1;
368 for (tries = 0; tries < 15 && freeindex == -1; tries++) 376 for (tries = 0; tries < 15 && freeindex == -1; tries++)
369 { 377 {
370 kx = (RANDOM () % (RP->Xsize - 2)) + 1; 378 kx = rndm (RP->Xsize - 2) + 1;
371 ky = (RANDOM () % (RP->Ysize - 2)) + 1; 379 ky = rndm (RP->Ysize - 2) + 1;
372 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1); 380 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
373 } 381 }
374 382
383 // can freeindex ever be < 0?
375 if (freeindex != -1) 384 if (freeindex >= 0)
376 { 385 {
377 kx += freearr_x[freeindex]; 386 kx += freearr_x [freeindex];
378 ky += freearr_y[freeindex]; 387 ky += freearr_y [freeindex];
379 } 388 }
380 } 389 }
381 } 390 }
382 else 391 else
383 { /* NO_PASS_DOORS --we have to work harder. */ 392 { /* NO_PASS_DOORS --we have to work harder. */
… …
387 { 396 {
388 if (wall_blocked (map, x, y)) 397 if (wall_blocked (map, x, y))
389 return 0; 398 return 0;
390 399
391 the_keymaster = find_monster_in_room (map, x, y, RP); 400 the_keymaster = find_monster_in_room (map, x, y, RP);
392 if (the_keymaster == NULL) /* if fail, find a spot to drop the key. */ 401 if (!the_keymaster) /* if fail, find a spot to drop the key. */
393 find_spot_in_room (map, x, y, &kx, &ky, RP); 402 find_spot_in_room (map, x, y, &kx, &ky, RP);
394 } 403 }
395 else 404 else
396 { 405 {
397 int sum = 0; /* count how many keys we actually place */ 406 int sum = 0; /* count how many keys we actually place */
… …
399 /* I'm lazy, so just try to place in all 4 directions. */ 408 /* I'm lazy, so just try to place in all 4 directions. */
400 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP); 409 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
401 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP); 410 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
402 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP); 411 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
403 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP); 412 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
413
404 if (sum < 2) /* we might have made a disconnected map-place more keys. */ 414 if (sum < 2) /* we might have made a disconnected map-place more keys. */
405 { /* diagnoally this time. */ 415 { /* diagonally this time. */
406 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP); 416 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
407 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP); 417 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
408 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP); 418 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
409 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP); 419 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
410 } 420 }
421
411 return 1; 422 return 1;
412 } 423 }
413 } 424 }
414 425
415 if (the_keymaster == NULL) 426 if (!the_keymaster)
416 { 427 {
417 the_key->x = kx; 428 the_key->x = kx;
418 the_key->y = ky; 429 the_key->y = ky;
419 insert_ob_in_map (the_key, map, NULL, 0); 430 insert_ob_in_map (the_key, map, NULL, 0);
420 return 1; 431 return 1;
… …
465 return theMonsterToFind; 476 return theMonsterToFind;
466 } 477 }
467 } 478 }
468 479
469 /* now search all the 8 squares around recursively for a monster,in random order */ 480 /* now search all the 8 squares around recursively for a monster,in random order */
470 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 481 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
471 { 482 {
472 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 483 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
473 if (theMonsterToFind != NULL) 484 if (theMonsterToFind != NULL)
474 return theMonsterToFind; 485 return theMonsterToFind;
475 } 486 }
… …
508 free (layout2); 519 free (layout2);
509 520
510 return theMonsterToFind; 521 return theMonsterToFind;
511} 522}
512 523
513
514
515
516/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 524/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
517int *room_free_spots_x; 525int *room_free_spots_x;
518int *room_free_spots_y; 526int *room_free_spots_y;
519int number_of_free_spots_in_room; 527int number_of_free_spots_in_room;
520 528
521/* the workhorse routine, which finds the free spots in a room: 529/* the workhorse routine, which finds the free spots in a room:
522a datastructure of free points is set up, and a position chosen from 530a datastructure of free points is set up, and a position chosen from
523that datastructure. */ 531that datastructure. */
524
525void 532void
526find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP) 533find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP)
527{ 534{
528 int i, j; 535 int i, j;
529 536
… …
540 /* check off this point */ 547 /* check off this point */
541 layout[x][y] = 1; 548 layout[x][y] = 1;
542 room_free_spots_x[number_of_free_spots_in_room] = x; 549 room_free_spots_x[number_of_free_spots_in_room] = x;
543 room_free_spots_y[number_of_free_spots_in_room] = y; 550 room_free_spots_y[number_of_free_spots_in_room] = y;
544 number_of_free_spots_in_room++; 551 number_of_free_spots_in_room++;
552
545 /* now search all the 8 squares around recursively for free spots,in random order */ 553 /* now search all the 8 squares around recursively for free spots,in random order */
546 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 554 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
547 {
548 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 555 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
549 }
550 556
551} 557}
552 558
553/* find a random non-blocked spot in this room to drop a key. */ 559/* find a random non-blocked spot in this room to drop a key. */
554void 560void
… …
565 /* allocate and copy the layout, converting C to 0. */ 571 /* allocate and copy the layout, converting C to 0. */
566 for (i = 0; i < RP->Xsize; i++) 572 for (i = 0; i < RP->Xsize; i++)
567 { 573 {
568 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize); 574 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
569 for (j = 0; j < RP->Ysize; j++) 575 for (j = 0; j < RP->Ysize; j++)
570 {
571 if (wall_blocked (map, i, j)) 576 if (wall_blocked (map, i, j))
572 layout2[i][j] = '#'; 577 layout2[i][j] = '#';
573 }
574 } 578 }
575 579
576 /* setup num_free_spots and room_free_spots */ 580 /* setup num_free_spots and room_free_spots */
577 find_spot_in_room_recursive (layout2, x, y, RP); 581 find_spot_in_room_recursive (layout2, x, y, RP);
578 582
579 if (number_of_free_spots_in_room > 0) 583 if (number_of_free_spots_in_room > 0)
580 { 584 {
581 i = RANDOM () % number_of_free_spots_in_room; 585 i = rndm (number_of_free_spots_in_room);
582 *kx = room_free_spots_x[i]; 586 *kx = room_free_spots_x[i];
583 *ky = room_free_spots_y[i]; 587 *ky = room_free_spots_y[i];
584 } 588 }
585 589
586 /* deallocate the temp. layout */ 590 /* deallocate the temp. layout */
587 for (i = 0; i < RP->Xsize; i++) 591 for (i = 0; i < RP->Xsize; i++)
588 {
589 free (layout2[i]); 592 free (layout2[i]);
590 } 593
591 free (layout2); 594 free (layout2);
592 free (room_free_spots_x); 595 free (room_free_spots_x);
593 free (room_free_spots_y); 596 free (room_free_spots_y);
594} 597}
595 598
596 599
597/* searches the map for a spot with walls around it. The more 600/* searches the map for a spot with walls around it. The more
598 walls the better, but it'll settle for 1 wall, or even 0, but 601 walls the better, but it'll settle for 1 wall, or even 0, but
599 it'll return 0 if no FREE spots are found.*/ 602 it'll return 0 if no FREE spots are found.*/
600
601void 603void
602find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP) 604find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP)
603{ 605{
604 int x, y; 606 int x, y;
605 int i; 607 int i;
… …
671 *cx = -1; 673 *cx = -1;
672 *cy = -1; 674 *cy = -1;
673 } 675 }
674} 676}
675 677
676
677void 678void
678remove_monsters (int x, int y, maptile *map) 679remove_monsters (int x, int y, maptile *map)
679{ 680{
680 object *tmp; 681 object *tmp;
681 682
682 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 683 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
683 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 684 if (QUERY_FLAG (tmp, FLAG_ALIVE))
684 { 685 {
685 if (tmp->head) 686 if (tmp->head)
686 tmp = tmp->head; 687 tmp = tmp->head;
687 tmp->remove (); 688 tmp->remove ();
… …
690 if (tmp == NULL) 691 if (tmp == NULL)
691 break; 692 break;
692 }; 693 };
693} 694}
694 695
695
696/* surrounds the point x,y by doors, so as to enclose something, like 696/* surrounds the point x,y by doors, so as to enclose something, like
697 a chest. It only goes as far as the 8 squares surrounding, and 697 a chest. It only goes as far as the 8 squares surrounding, and
698 it'll remove any monsters it finds.*/ 698 it'll remove any monsters it finds.*/
699
700object ** 699object **
701surround_by_doors (maptile *map, char **layout, int x, int y, int opts) 700surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
702{ 701{
703 int i; 702 int i;
704 char *doors[2]; 703 const char *doors[2];
705 object **doorlist; 704 object **doorlist;
706 int ndoors_made = 0; 705 int ndoors_made = 0;
707 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */ 706 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
708 707
709 /* this is a list we pick from, for horizontal and vertical doors */ 708 /* this is a list we pick from, for horizontal and vertical doors */
… …
721 /* place doors in all the 8 adjacent unblocked squares. */ 720 /* place doors in all the 8 adjacent unblocked squares. */
722 for (i = 1; i < 9; i++) 721 for (i = 1; i < 9; i++)
723 { 722 {
724 int x1 = x + freearr_x[i], y1 = y + freearr_y[i]; 723 int x1 = x + freearr_x[i], y1 = y + freearr_y[i];
725 724
726 if (!wall_blocked (map, x1, y1) || layout[x1][y1] == '>') 725 if (!wall_blocked (map, x1, y1) && layout[x1][y1] == '>')
727 { /* place a door */ 726 { /* place a door */
727 remove_monsters (x1, y1, map);
728
728 object *new_door = get_archetype ((freearr_x[i] == 0) ? doors[1] : doors[0]); 729 object *new_door = get_archetype (freearr_x[i] == 0 ? doors[1] : doors[0]);
729 730 map->insert (new_door, x1, y1);
730 new_door->x = x + freearr_x[i];
731 new_door->y = y + freearr_y[i];
732 remove_monsters (new_door->x, new_door->y, map);
733 insert_ob_in_map (new_door, map, NULL, 0);
734 doorlist[ndoors_made] = new_door; 731 doorlist[ndoors_made] = new_door;
735 ndoors_made++; 732 ndoors_made++;
736 } 733 }
737 } 734 }
735
738 return doorlist; 736 return doorlist;
739} 737}
740 738
741 739
742/* returns the first door in this square, or NULL if there isn't a door. */ 740/* returns the first door in this square, or NULL if there isn't a door. */
… …
785 } 783 }
786 } 784 }
787 else 785 else
788 { 786 {
789 layout[x][y] = 1; 787 layout[x][y] = 1;
788
790 /* now search all the 8 squares around recursively for free spots,in random order */ 789 /* now search all the 8 squares around recursively for free spots,in random order */
791 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 790 for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
792 find_doors_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], doorlist, ndoors, RP); 791 find_doors_in_room_recursive (layout, map,
792 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
793 doorlist, ndoors, RP);
793 } 794 }
794} 795}
795 796
796/* find a random non-blocked spot in this room to drop a key. */ 797/* find a random non-blocked spot in this room to drop a key. */
797object ** 798object **
… …
853 new_door->y = door->y; 854 new_door->y = door->y;
854 door->remove (); 855 door->remove ();
855 door->destroy (); 856 door->destroy ();
856 doorlist[i] = new_door; 857 doorlist[i] = new_door;
857 insert_ob_in_map (new_door, map, NULL, 0); 858 insert_ob_in_map (new_door, map, NULL, 0);
858 sprintf (keybuf, "%d", (int) RANDOM ()); 859 sprintf (keybuf, "%d", rndm (1000000000));
859 new_door->slaying = keybuf; 860 new_door->slaying = keybuf;
860 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 861 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP);
861 } 862 }
862 } 863 }
863 864

Diff Legend

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