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.22 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.37 by root, Fri May 2 21:01:53 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* placing treasure in maps, where appropriate. */ 24/* placing treasure in maps, where appropriate. */
26 25
27#include <global.h> 26#include <global.h>
… …
41#define LAST_OPTION 64 /* set this to the last real option, for random */ 40#define LAST_OPTION 64 /* set this to the last real option, for random */
42 41
43#define NO_PASS_DOORS 0 42#define NO_PASS_DOORS 0
44#define PASS_DOORS 1 43#define PASS_DOORS 1
45 44
45/* a macro to get a strongly centered random distribution,
46 from 0 to x, centered at x/2 */
47static int
48bc_random (int x)
49{
50 return (rndm (x) + rndm (x) + rndm (x)) / 3;
51}
46 52
47/* returns true if square x,y has P_NO_PASS set, which is true for walls 53/* returns true if square x,y has P_NO_PASS set, which is true for walls
48 * and doors but not monsters. 54 * and doors but not monsters.
49 * This function is not map tile aware. 55 * This function is not map tile aware.
50 */ 56 */
… …
52wall_blocked (maptile *m, int x, int y) 58wall_blocked (maptile *m, int x, int y)
53{ 59{
54 if (OUT_OF_REAL_MAP (m, x, y)) 60 if (OUT_OF_REAL_MAP (m, x, y))
55 return 1; 61 return 1;
56 62
63 m->at (x, y).update ();
57 int r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT; 64 return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
58 return r;
59} 65}
60 66
61/* place treasures in the map, given the 67/* place treasures in the map, given the
62map, (required) 68map, (required)
63layout, (required) 69layout, (required)
… …
76 if (treasure_style) 82 if (treasure_style)
77 if (!strcmp (treasure_style, "none")) 83 if (!strcmp (treasure_style, "none"))
78 return; 84 return;
79 85
80 if (treasureoptions <= 0) 86 if (treasureoptions <= 0)
81 treasureoptions = RANDOM () % (2 * LAST_OPTION); 87 treasureoptions = rndm (2 * LAST_OPTION);
82 88
83 /* filter out the mutually exclusive options */ 89 /* filter out the mutually exclusive options */
84 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 90 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
85 { 91 {
86 if (rndm (2)) 92 if (rndm (2))
… …
89 treasureoptions -= 2; 95 treasureoptions -= 2;
90 } 96 }
91 97
92 /* pick the number of treasures */ 98 /* pick the number of treasures */
93 if (treasureoptions & SPARSE) 99 if (treasureoptions & SPARSE)
94 num_treasures = BC_RANDOM (RP->total_map_hp / 600 + RP->difficulty / 2 + 1); 100 num_treasures = bc_random (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
95 else if (treasureoptions & RICH) 101 else if (treasureoptions & RICH)
96 num_treasures = BC_RANDOM (RP->total_map_hp / 150 + 2 * RP->difficulty + 1); 102 num_treasures = bc_random (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
97 else 103 else
98 num_treasures = BC_RANDOM (RP->total_map_hp / 300 + RP->difficulty + 1); 104 num_treasures = bc_random (RP->total_map_hp / 300 + RP->difficulty + 1);
99 105
100 if (num_treasures <= 0) 106 if (num_treasures <= 0)
101 return; 107 return;
102 108
103 /* get the style map */ 109 /* get the style map */
104 sprintf (styledirname, "%s", "/styles/treasurestyles"); 110 sprintf (styledirname, "%s", "/styles/treasurestyles");
105 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style); 111 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style);
106 style_map = find_style (styledirname, treasure_style, -1); 112 style_map = find_style (styledirname, treasure_style, -1);
107 113
114 if (!style_map)
115 {
116 LOG (llevError, "unable to load style map %s %s.\n", styledirname, treasure_style);
117 return;
118 }
119
108 /* all the treasure at one spot in the map. */ 120 /* all the treasure at one spot in the map. */
109 if (treasureoptions & CONCENTRATED) 121 if (treasureoptions & CONCENTRATED)
110 { 122 {
111
112 /* map_layout_style global, and is previously set */ 123 /* map_layout_style global, and is previously set */
113 switch (RP->map_layout_style) 124 switch (RP->map_layout_style)
114 { 125 {
115 case LAYOUT_ONION: 126 case LAYOUT_ONION:
116 case LAYOUT_SPIRAL: 127 case LAYOUT_SPIRAL:
… …
124 for (j = 0; j < RP->Ysize; j++) 135 for (j = 0; j < RP->Ysize; j++)
125 { 136 {
126 if (layout[i][j] == 'C' || layout[i][j] == '>') 137 if (layout[i][j] == 'C' || layout[i][j] == '>')
127 { 138 {
128 int tdiv = RP->symmetry_used; 139 int tdiv = RP->symmetry_used;
129 object **doorlist;
130 object *chest; 140 object *chest;
131 141
132 if (tdiv == 3) 142 if (tdiv == 3)
133 tdiv = 2; /* this symmetry uses a divisor of 2 */ 143 tdiv = 2; /* this symmetry uses a divisor of 2 */
144
134 /* don't put a chest on an exit. */ 145 /* don't put a chest on an exit. */
135 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP); 146 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP);
147
136 if (!chest) 148 if (!chest)
137 continue; /* if no chest was placed NEXT */ 149 continue; /* if no chest was placed NEXT */
150
138 if (treasureoptions & (DOORED | HIDDEN)) 151 if (treasureoptions & (DOORED | HIDDEN))
139 { 152 {
140 doorlist = find_doors_in_room (map, i, j, RP); 153 object **doorlist = find_doors_in_room (map, i, j, RP);
141 lock_and_hide_doors (doorlist, map, treasureoptions, RP); 154 lock_and_hide_doors (doorlist, map, treasureoptions, RP);
142 free (doorlist); 155 free (doorlist);
143 } 156 }
144 } 157 }
145 } 158 }
146 } 159 }
147 break; 160 break;
148 } 161 }
162
149 default: 163 default:
150 { 164 {
151 int i, j, tries; 165 int i, j, tries;
152 object *chest; 166 object *chest;
153 object **doorlist; 167 object **doorlist;
154 168
155 i = j = -1; 169 i = j = -1;
156 tries = 0; 170 tries = 0;
157 while (i == -1 && tries < 100) 171 while (i == -1 && tries < 100)
158 { 172 {
159 i = RANDOM () % (RP->Xsize - 2) + 1; 173 i = rndm (RP->Xsize - 2) + 1;
160 j = RANDOM () % (RP->Ysize - 2) + 1; 174 j = rndm (RP->Ysize - 2) + 1;
161 find_enclosed_spot (map, &i, &j, RP); 175 find_enclosed_spot (map, &i, &j, RP);
176
162 if (wall_blocked (map, i, j)) 177 if (wall_blocked (map, i, j))
163 i = -1; 178 i = -1;
179
164 tries++; 180 tries++;
165 } 181 }
182
166 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP); 183 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP);
184
167 if (!chest) 185 if (!chest)
168 return; 186 return;
187
169 i = chest->x; 188 i = chest->x;
170 j = chest->y; 189 j = chest->y;
171 if (treasureoptions & (DOORED | HIDDEN)) 190 if (treasureoptions & (DOORED | HIDDEN))
172 { 191 {
173 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 192 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
181 { /* DIFFUSE treasure layout */ 200 { /* DIFFUSE treasure layout */
182 int ti, i, j; 201 int ti, i, j;
183 202
184 for (ti = 0; ti < num_treasures; ti++) 203 for (ti = 0; ti < num_treasures; ti++)
185 { 204 {
186 i = RANDOM () % (RP->Xsize - 2) + 1; 205 i = rndm (RP->Xsize - 2) + 1;
187 j = RANDOM () % (RP->Ysize - 2) + 1; 206 j = rndm (RP->Ysize - 2) + 1;
188 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 207 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
189 } 208 }
190 } 209 }
191} 210}
192 211
193/* put a chest into the map, near x and y, with the treasure style 212/* put a chest into the map, near x and y, with the treasure style
194 determined (may be null, or may be a treasure list from lib/treasures, 213 determined (may be null, or may be a treasure list from lib/treasures,
195 if the global variable "treasurestyle" is set to that treasure list's name */ 214 if the global variable "treasurestyle" is set to that treasure list's name */
196
197object * 215object *
198place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP) 216place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP)
199{ 217{
200 object *the_chest; 218 object *the_chest;
201 int i, xl, yl; 219 int i, xl, yl;
… …
226 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 244 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
227 245
228 if (tlist != NULL) 246 if (tlist != NULL)
229 for (ti = 0; ti < n_treasures; ti++) 247 for (ti = 0; ti < n_treasures; ti++)
230 { /* use the treasure list */ 248 { /* use the treasure list */
231 object *new_treasure = pick_random_object (style_map); 249 object *new_treasure = style_map->pick_random_object ();
232 250
233 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 251 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
234 } 252 }
235 else 253 else
236 { /* use the style map */ 254 { /* use the style map */
237 the_chest->randomitems = tlist; 255 the_chest->randomitems = tlist;
238 the_chest->stats.hp = n_treasures; 256 the_chest->stats.hp = n_treasures;
239 } 257 }
240#endif 258#endif
241 { /* neither style_map no treasure list given */ 259 { /* neither style_map no treasure list given */
242 treasurelist *tlist = find_treasurelist ("chest"); 260 treasurelist *tlist = treasurelist::find ("chest");
243 261
244 the_chest->randomitems = tlist; 262 the_chest->randomitems = tlist;
245 the_chest->stats.hp = n_treasures; 263 the_chest->stats.hp = n_treasures;
246 } 264 }
247 265
248 /* stick a trap in the chest if required */ 266 /* stick a trap in the chest if required */
249 if (treasureoptions & TRAPPED) 267 if (treasureoptions & TRAPPED)
250 { 268 {
251 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 269 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
252 object *the_trap;
253 270
254 if (trap_map) 271 if (trap_map)
255 { 272 {
256 the_trap = pick_random_object (trap_map); 273 object *the_trap = trap_map->pick_random_object ();
274
257 the_trap->stats.Cha = 10 + RP->difficulty; 275 the_trap->stats.Cha = 10 + RP->difficulty;
258 the_trap->level = BC_RANDOM ((3 * RP->difficulty) / 2); 276 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
277
259 if (the_trap) 278 if (the_trap)
260 { 279 {
261 object *new_trap; 280 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
262 281
263 new_trap = arch_to_object (the_trap->arch);
264 new_trap->copy_to (the_trap);
265 new_trap->x = x; 282 new_trap->x = x;
266 new_trap->y = y; 283 new_trap->y = y;
267 insert_ob_in_ob (new_trap, the_chest); 284 insert_ob_in_ob (new_trap, the_chest);
268 } 285 }
269 } 286 }
270 } 287 }
271 288
272 /* set the chest lock code, and call the keyplacer routine with 289 /* set the chest lock code, and call the keyplacer routine with
273 the lockcode. It's not worth bothering to lock the chest if 290 the lockcode. It's not worth bothering to lock the chest if
274 there's only 1 treasure.... */ 291 there's only 1 treasure.... */
275
276 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 292 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
277 { 293 {
278 char keybuf[1024]; 294 char keybuf[1024];
279 295
280 sprintf (keybuf, "%d", (int) RANDOM ()); 296 sprintf (keybuf, "%d", rndm (1000000000));
281 the_chest->slaying = keybuf; 297 the_chest->slaying = keybuf;
282 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 298 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP);
283 } 299 }
284 300
285 /* actually place the chest. */ 301 /* actually place the chest. */
… …
347 int tries = 0; 363 int tries = 0;
348 364
349 the_keymaster = 0; 365 the_keymaster = 0;
350 while (tries < 15 && !the_keymaster) 366 while (tries < 15 && !the_keymaster)
351 { 367 {
352 i = (RANDOM () % (RP->Xsize - 2)) + 1; 368 i = rndm (RP->Xsize - 2) + 1;
353 j = (RANDOM () % (RP->Ysize - 2)) + 1; 369 j = rndm (RP->Ysize - 2) + 1;
354 tries++; 370 tries++;
355 the_keymaster = find_closest_monster (map, i, j, RP); 371 the_keymaster = find_closest_monster (map, i, j, RP);
356 } 372 }
357 373
358 /* if we don't find a good keymaster, drop the key on the ground. */ 374 /* if we don't find a good keymaster, drop the key on the ground. */
… …
361 int freeindex; 377 int freeindex;
362 378
363 freeindex = -1; 379 freeindex = -1;
364 for (tries = 0; tries < 15 && freeindex == -1; tries++) 380 for (tries = 0; tries < 15 && freeindex == -1; tries++)
365 { 381 {
366 kx = (RANDOM () % (RP->Xsize - 2)) + 1; 382 kx = rndm (RP->Xsize - 2) + 1;
367 ky = (RANDOM () % (RP->Ysize - 2)) + 1; 383 ky = rndm (RP->Ysize - 2) + 1;
368 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1); 384 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
369 } 385 }
370 386
371 // can freeindex ever be < 0? 387 // can freeindex ever be < 0?
372 if (freeindex >= 0) 388 if (freeindex >= 0)
… …
417 the_key->y = ky; 433 the_key->y = ky;
418 insert_ob_in_map (the_key, map, NULL, 0); 434 insert_ob_in_map (the_key, map, NULL, 0);
419 return 1; 435 return 1;
420 } 436 }
421 437
422 insert_ob_in_ob (the_key, the_keymaster); 438 insert_ob_in_ob (the_key, the_keymaster->head_ ());
423 return 1; 439 return 1;
424} 440}
425 441
426 442
427 443
… …
470 { 486 {
471 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 487 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
472 if (theMonsterToFind != NULL) 488 if (theMonsterToFind != NULL)
473 return theMonsterToFind; 489 return theMonsterToFind;
474 } 490 }
491
475 return theMonsterToFind; 492 return theMonsterToFind;
476} 493}
477
478 494
479/* sets up some data structures: the _recursive form does the 495/* sets up some data structures: the _recursive form does the
480 real work. */ 496 real work. */
481
482object * 497object *
483find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 498find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
484{ 499{
485 char **layout2; 500 Layout layout2 (RP);
486 int i, j; 501
502 layout2->clear ();
503
504 /* allocate and copy the layout, converting C to 0. */
505 for (int i = 0; i < layout2->w; i++)
506 for (int j = 0; j < layout2->h; j++)
507 if (wall_blocked (map, i, j))
508 layout2[i][j] = '#';
487 509
488 theMonsterToFind = 0; 510 theMonsterToFind = 0;
489 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
490 /* allocate and copy the layout, converting C to 0. */
491 for (i = 0; i < RP->Xsize; i++)
492 {
493 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
494 for (j = 0; j < RP->Ysize; j++)
495 {
496 if (wall_blocked (map, i, j))
497 layout2[i][j] = '#';
498 }
499 }
500 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP); 511 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
501 512
502 /* deallocate the temp. layout */ 513 layout2.free ();
503 for (i = 0; i < RP->Xsize; i++)
504 {
505 free (layout2[i]);
506 }
507 free (layout2);
508 514
509 return theMonsterToFind; 515 return theMonsterToFind;
510} 516}
511 517
512/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 518/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
… …
568 /* setup num_free_spots and room_free_spots */ 574 /* setup num_free_spots and room_free_spots */
569 find_spot_in_room_recursive (layout2, x, y, RP); 575 find_spot_in_room_recursive (layout2, x, y, RP);
570 576
571 if (number_of_free_spots_in_room > 0) 577 if (number_of_free_spots_in_room > 0)
572 { 578 {
573 i = RANDOM () % number_of_free_spots_in_room; 579 i = rndm (number_of_free_spots_in_room);
574 *kx = room_free_spots_x[i]; 580 *kx = room_free_spots_x[i];
575 *ky = room_free_spots_y[i]; 581 *ky = room_free_spots_y[i];
576 } 582 }
577 583
578 /* deallocate the temp. layout */ 584 /* deallocate the temp. layout */
… …
646 *cy = ly; 652 *cy = ly;
647 return; 653 return;
648 } 654 }
649 } 655 }
650 /* give up and return the closest free spot. */ 656 /* give up and return the closest free spot. */
651 i = find_free_spot (&archetype::find ("chest")->clone, map, x, y, 1, SIZEOFFREE1 + 1); 657 i = find_free_spot (archetype::find ("chest"), map, x, y, 1, SIZEOFFREE1 + 1);
652 658
653 if (i != -1) 659 if (i != -1)
654 { 660 {
655 *cx = x + freearr_x[i]; 661 *cx = x + freearr_x[i];
656 *cy = y + freearr_y[i]; 662 *cy = y + freearr_y[i];
… …
686 it'll remove any monsters it finds.*/ 692 it'll remove any monsters it finds.*/
687object ** 693object **
688surround_by_doors (maptile *map, char **layout, int x, int y, int opts) 694surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
689{ 695{
690 int i; 696 int i;
691 char *doors[2]; 697 const char *doors[2];
692 object **doorlist; 698 object **doorlist;
693 int ndoors_made = 0; 699 int ndoors_made = 0;
694 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */ 700 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
695 701
696 /* this is a list we pick from, for horizontal and vertical doors */ 702 /* this is a list we pick from, for horizontal and vertical doors */
… …
734 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 740 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
735 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 741 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
736 return tmp; 742 return tmp;
737 return NULL; 743 return NULL;
738} 744}
739
740 745
741/* the workhorse routine, which finds the doors in a room */ 746/* the workhorse routine, which finds the doors in a room */
742void 747void
743find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP) 748find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP)
744{ 749{
… …
759 layout[x][y] = 1; 764 layout[x][y] = 1;
760 door = door_in_square (map, x, y); 765 door = door_in_square (map, x, y);
761 if (door) 766 if (door)
762 { 767 {
763 doorlist[*ndoors] = door; 768 doorlist[*ndoors] = door;
769
764 if (*ndoors > 1022) /* eek! out of memory */ 770 if (*ndoors > 1022) /* eek! out of memory */
765 { 771 {
766 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n"); 772 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n");
767 return; 773 return;
768 } 774 }
… …
771 } 777 }
772 } 778 }
773 else 779 else
774 { 780 {
775 layout[x][y] = 1; 781 layout[x][y] = 1;
782
776 /* now search all the 8 squares around recursively for free spots,in random order */ 783 /* now search all the 8 squares around recursively for free spots,in random order */
777 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 784 for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
778 find_doors_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], doorlist, ndoors, RP); 785 find_doors_in_room_recursive (layout, map,
786 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
787 doorlist, ndoors, RP);
779 } 788 }
780} 789}
781 790
782/* find a random non-blocked spot in this room to drop a key. */ 791/* find a random non-blocked spot in this room to drop a key. */
783object ** 792object **
784find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 793find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
785{ 794{
786 char **layout2;
787 object **doorlist;
788 int i, j; 795 int i, j;
789 int ndoors = 0; 796 int ndoors = 0;
790 797
791 doorlist = (object **) calloc (sizeof (int), 1024); 798 object **doorlist = (object **)calloc (sizeof (int), 1024);
792 799
793 layout2 = (char **) calloc (sizeof (char *), RP->Xsize); 800 LayoutData layout2 (RP->Xsize, RP->Ysize);
801 layout2.clear ();
802
794 /* allocate and copy the layout, converting C to 0. */ 803 /* allocate and copy the layout, converting C to 0. */
795 for (i = 0; i < RP->Xsize; i++) 804 for (i = 0; i < RP->Xsize; i++)
796 {
797 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
798 for (j = 0; j < RP->Ysize; j++) 805 for (j = 0; j < RP->Ysize; j++)
799 { 806 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
800 if (wall_blocked (map, i, j))
801 layout2[i][j] = '#';
802 }
803 }
804 807
805 /* setup num_free_spots and room_free_spots */ 808 /* setup num_free_spots and room_free_spots */
806 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 809 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
807 810
808 /* deallocate the temp. layout */
809 for (i = 0; i < RP->Xsize; i++)
810 free (layout2[i]);
811
812 free (layout2);
813 return doorlist; 811 return doorlist;
814} 812}
815
816
817 813
818/* locks and/or hides all the doors in doorlist, or does nothing if 814/* locks and/or hides all the doors in doorlist, or does nothing if
819 opts doesn't say to lock/hide doors. */ 815 opts doesn't say to lock/hide doors. */
820
821void 816void
822lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP) 817lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP)
823{ 818{
824 object *door; 819 object *door;
825 int i; 820 int i;
… …
839 new_door->y = door->y; 834 new_door->y = door->y;
840 door->remove (); 835 door->remove ();
841 door->destroy (); 836 door->destroy ();
842 doorlist[i] = new_door; 837 doorlist[i] = new_door;
843 insert_ob_in_map (new_door, map, NULL, 0); 838 insert_ob_in_map (new_door, map, NULL, 0);
844 sprintf (keybuf, "%d", (int) RANDOM ()); 839 sprintf (keybuf, "%d", rndm (1000000000));
845 new_door->slaying = keybuf; 840 new_door->slaying = keybuf;
846 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 841 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP);
847 } 842 }
848 } 843 }
849 844
… …
860 { 855 {
861 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 856 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
862 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 857 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
863 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 858 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
864 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 859 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
860
865 door->face = wallface->face; 861 door->face = wallface->face;
862
866 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 863 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
867 wallface->remove (); 864 wallface->remove ();
865
868 wallface->destroy (); 866 wallface->destroy ();
869 } 867 }
870 } 868 }
871 } 869 }
872} 870}

Diff Legend

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