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.33 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.40 by root, Thu May 8 13:47:19 2008 UTC

… …
45/* a macro to get a strongly centered random distribution, 45/* a macro to get a strongly centered random distribution,
46 from 0 to x, centered at x/2 */ 46 from 0 to x, centered at x/2 */
47static int 47static int
48bc_random (int x) 48bc_random (int x)
49{ 49{
50 return (rndm (x) + rndm (x) + rndm (x)) / 3; 50 return (rmg_rndm (x) + rmg_rndm (x) + rmg_rndm (x)) / 3;
51}
52
53static object *
54gen_key (const shstr &keycode)
55{
56 /* get a key and set its keycode */
57 object *key = archetype::get (shstr_key2);
58
59 key->slaying = keycode;
60 key->stats.food = 100;
61 key->speed_left = -1.f;
62 key->flag [FLAG_IS_USED_UP] = true;
63 key->set_speed (1.f / 300.f);
64
65 return key;
66}
67
68/* places keys in the map, preferably in something alive.
69 keycode is the key's code,
70 door_flag is either PASS_DOORS or NO_PASS_DOORS.
71 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
72 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
73 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
74
75 The idea is that you call keyplace on x,y where a door is, and it'll make
76 sure a key is placed on both sides of the door.
77*/
78static int
79keyplace (maptile *map, int x, int y, const shstr &keycode, int door_flag, int n_keys, random_map_params *RP)
80{
81 int i, j;
82 int kx = 0, ky = 0;
83 object *the_keymaster; /* the monster that gets the key. */
84 object *the_key = gen_key (keycode);
85
86 if (door_flag == PASS_DOORS)
87 {
88 int tries = 0;
89
90 the_keymaster = 0;
91 while (tries < 15 && !the_keymaster)
92 {
93 i = rmg_rndm (RP->Xsize - 2) + 1;
94 j = rmg_rndm (RP->Ysize - 2) + 1;
95 tries++;
96 the_keymaster = find_closest_monster (map, i, j, RP);
97 }
98
99 /* if we don't find a good keymaster, drop the key on the ground. */
100 if (!the_keymaster)
101 {
102 int freeindex;
103
104 freeindex = -1;
105 for (tries = 0; tries < 15 && freeindex == -1; tries++)
106 {
107 kx = rmg_rndm (RP->Xsize - 2) + 1;
108 ky = rmg_rndm (RP->Ysize - 2) + 1;
109 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
110 }
111
112 // can freeindex ever be < 0?
113 if (freeindex >= 0)
114 {
115 kx += freearr_x [freeindex];
116 ky += freearr_y [freeindex];
117 }
118 }
119 }
120 else
121 { /* NO_PASS_DOORS --we have to work harder. */
122 /* don't try to keyplace if we're sitting on a blocked square and
123 NO_PASS_DOORS is set. */
124 if (n_keys == 1)
125 {
126 if (wall_blocked (map, x, y))
127 {
128 the_key->destroy ();
129 return 0;
130 }
131
132 the_keymaster = find_monster_in_room (map, x, y, RP);
133 if (!the_keymaster) /* if fail, find a spot to drop the key. */
134 find_spot_in_room (map, x, y, &kx, &ky, RP);
135 }
136 else
137 {
138 int sum = 0; /* count how many keys we actually place */
139
140 /* I'm lazy, so just try to place in all 4 directions. */
141 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
142 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
143 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
144 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
145
146 if (sum < 2) /* we might have made a disconnected map-place more keys. */
147 { /* diagonally this time. */
148 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
149 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
150 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
151 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
152 }
153
154 the_key->destroy ();
155 return 1;
156 }
157 }
158
159 if (the_keymaster)
160 the_keymaster->head_ ()->insert (the_key);
161 else
162 {
163 the_key->x = kx;
164 the_key->y = ky;
165 insert_ob_in_map (the_key, map, NULL, 0);
166 }
167
168 return 1;
51} 169}
52 170
53/* returns true if square x,y has P_NO_PASS set, which is true for walls 171/* returns true if square x,y has P_NO_PASS set, which is true for walls
54 * and doors but not monsters. 172 * and doors but not monsters.
55 * This function is not map tile aware. 173 * This function is not map tile aware.
… …
82 if (treasure_style) 200 if (treasure_style)
83 if (!strcmp (treasure_style, "none")) 201 if (!strcmp (treasure_style, "none"))
84 return; 202 return;
85 203
86 if (treasureoptions <= 0) 204 if (treasureoptions <= 0)
87 treasureoptions = rndm (2 * LAST_OPTION); 205 treasureoptions = rmg_rndm (2 * LAST_OPTION);
88 206
89 /* filter out the mutually exclusive options */ 207 /* filter out the mutually exclusive options */
90 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 208 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
91 { 209 {
92 if (rndm (2)) 210 if (rmg_rndm (2))
93 treasureoptions -= 1; 211 treasureoptions -= 1;
94 else 212 else
95 treasureoptions -= 2; 213 treasureoptions -= 2;
96 } 214 }
97 215
… …
118 } 236 }
119 237
120 /* all the treasure at one spot in the map. */ 238 /* all the treasure at one spot in the map. */
121 if (treasureoptions & CONCENTRATED) 239 if (treasureoptions & CONCENTRATED)
122 { 240 {
123
124 /* map_layout_style global, and is previously set */ 241 /* map_layout_style global, and is previously set */
125 switch (RP->map_layout_style) 242 switch (RP->map_layout_style)
126 { 243 {
127 case LAYOUT_ONION: 244 case LAYOUT_ONION:
128 case LAYOUT_SPIRAL: 245 case LAYOUT_SPIRAL:
… …
140 int tdiv = RP->symmetry_used; 257 int tdiv = RP->symmetry_used;
141 object *chest; 258 object *chest;
142 259
143 if (tdiv == 3) 260 if (tdiv == 3)
144 tdiv = 2; /* this symmetry uses a divisor of 2 */ 261 tdiv = 2; /* this symmetry uses a divisor of 2 */
262
145 /* don't put a chest on an exit. */ 263 /* don't put a chest on an exit. */
146 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP); 264 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP);
147 265
148 if (!chest) 266 if (!chest)
149 continue; /* if no chest was placed NEXT */ 267 continue; /* if no chest was placed NEXT */
… …
157 } 275 }
158 } 276 }
159 } 277 }
160 break; 278 break;
161 } 279 }
280
162 default: 281 default:
163 { 282 {
164 int i, j, tries; 283 int i, j, tries;
165 object *chest; 284 object *chest;
166 object **doorlist; 285 object **doorlist;
167 286
168 i = j = -1; 287 i = j = -1;
169 tries = 0; 288 tries = 0;
170 while (i == -1 && tries < 100) 289 while (i == -1 && tries < 100)
171 { 290 {
172 i = rndm (RP->Xsize - 2) + 1; 291 i = rmg_rndm (RP->Xsize - 2) + 1;
173 j = rndm (RP->Ysize - 2) + 1; 292 j = rmg_rndm (RP->Ysize - 2) + 1;
174 find_enclosed_spot (map, &i, &j, RP); 293 find_enclosed_spot (map, &i, &j, RP);
294
175 if (wall_blocked (map, i, j)) 295 if (wall_blocked (map, i, j))
176 i = -1; 296 i = -1;
297
177 tries++; 298 tries++;
178 } 299 }
300
179 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP); 301 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP);
302
180 if (!chest) 303 if (!chest)
181 return; 304 return;
305
182 i = chest->x; 306 i = chest->x;
183 j = chest->y; 307 j = chest->y;
184 if (treasureoptions & (DOORED | HIDDEN)) 308 if (treasureoptions & (DOORED | HIDDEN))
185 { 309 {
186 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 310 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
194 { /* DIFFUSE treasure layout */ 318 { /* DIFFUSE treasure layout */
195 int ti, i, j; 319 int ti, i, j;
196 320
197 for (ti = 0; ti < num_treasures; ti++) 321 for (ti = 0; ti < num_treasures; ti++)
198 { 322 {
199 i = rndm (RP->Xsize - 2) + 1; 323 i = rmg_rndm (RP->Xsize - 2) + 1;
200 j = rndm (RP->Ysize - 2) + 1; 324 j = rmg_rndm (RP->Ysize - 2) + 1;
201 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 325 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
202 } 326 }
203 } 327 }
204} 328}
205 329
206/* put a chest into the map, near x and y, with the treasure style 330/* put a chest into the map, near x and y, with the treasure style
207 determined (may be null, or may be a treasure list from lib/treasures, 331 determined (may be null, or may be a treasure list from lib/treasures,
208 if the global variable "treasurestyle" is set to that treasure list's name */ 332 if the global variable "treasurestyle" is set to that treasure list's name */
209
210object * 333object *
211place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP) 334place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP)
212{ 335{
213 object *the_chest;
214 int i, xl, yl;
215
216 the_chest = get_archetype ("chest"); /* was "chest_2" */ 336 object *the_chest = archetype::get (shstr_chest); /* was "chest_2" */
217 337
218 /* first, find a place to put the chest. */ 338 /* first, find a place to put the chest. */
219 i = find_first_free_spot (the_chest, map, x, y); 339 int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng
220 if (i == -1) 340 if (i == -1)
221 { 341 {
222 the_chest->destroy (); 342 the_chest->destroy ();
223 return NULL; 343 return NULL;
224 } 344 }
225 345
226 xl = x + freearr_x[i]; 346 int xl = x + freearr_x[i];
227 yl = y + freearr_y[i]; 347 int yl = y + freearr_y[i];
228 348
229 /* if the placement is blocked, return a fail. */ 349 /* if the placement is blocked, return a fail. */
230 if (wall_blocked (map, xl, yl)) 350 if (wall_blocked (map, xl, yl))
231 return 0; 351 return 0;
232 352
… …
239 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 359 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
240 360
241 if (tlist != NULL) 361 if (tlist != NULL)
242 for (ti = 0; ti < n_treasures; ti++) 362 for (ti = 0; ti < n_treasures; ti++)
243 { /* use the treasure list */ 363 { /* use the treasure list */
244 object *new_treasure = style_map->pick_random_object (); 364 object *new_treasure = style_map->pick_random_object (rmg_rndm);
245 365
246 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 366 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
247 } 367 }
248 else 368 else
249 { /* use the style map */ 369 { /* use the style map */
… …
260 380
261 /* stick a trap in the chest if required */ 381 /* stick a trap in the chest if required */
262 if (treasureoptions & TRAPPED) 382 if (treasureoptions & TRAPPED)
263 { 383 {
264 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 384 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
265 object *the_trap;
266 385
267 if (trap_map) 386 if (trap_map)
268 { 387 {
269 the_trap = trap_map->pick_random_object (); 388 object *the_trap = trap_map->pick_random_object (rmg_rndm);
389
270 the_trap->stats.Cha = 10 + RP->difficulty; 390 the_trap->stats.Cha = 10 + RP->difficulty;
271 the_trap->level = bc_random ((3 * RP->difficulty) / 2); 391 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
392
272 if (the_trap) 393 if (the_trap)
273 { 394 {
274 object *new_trap; 395 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
275 396
276 new_trap = arch_to_object (the_trap->arch);
277 new_trap->copy_to (the_trap);
278 new_trap->x = x; 397 new_trap->x = x;
279 new_trap->y = y; 398 new_trap->y = y;
280 insert_ob_in_ob (new_trap, the_chest); 399 insert_ob_in_ob (new_trap, the_chest);
281 } 400 }
282 } 401 }
… …
285 /* set the chest lock code, and call the keyplacer routine with 404 /* set the chest lock code, and call the keyplacer routine with
286 the lockcode. It's not worth bothering to lock the chest if 405 the lockcode. It's not worth bothering to lock the chest if
287 there's only 1 treasure.... */ 406 there's only 1 treasure.... */
288 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 407 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
289 { 408 {
290 char keybuf[1024]; 409 the_chest->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
291
292 sprintf (keybuf, "%d", rndm (1000000000));
293 the_chest->slaying = keybuf;
294 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 410 keyplace (map, x, y, the_chest->slaying, PASS_DOORS, 1, RP);
295 } 411 }
296 412
297 /* actually place the chest. */ 413 /* actually place the chest. */
298 the_chest->x = xl; 414 the_chest->x = xl;
299 the_chest->y = yl; 415 the_chest->y = yl;
… …
328 } 444 }
329 } 445 }
330 return NULL; 446 return NULL;
331} 447}
332 448
333
334
335/* places keys in the map, preferably in something alive.
336 keycode is the key's code,
337 door_flag is either PASS_DOORS or NO_PASS_DOORS.
338 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
339 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
340 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
341
342 The idea is that you call keyplace on x,y where a door is, and it'll make
343 sure a key is placed on both sides of the door.
344*/
345int
346keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
347{
348 int i, j;
349 int kx = 0, ky = 0;
350 object *the_keymaster; /* the monster that gets the key. */
351 object *the_key;
352
353 /* get a key and set its keycode */
354 the_key = get_archetype ("key2");
355 the_key->slaying = keycode;
356
357 if (door_flag == PASS_DOORS)
358 {
359 int tries = 0;
360
361 the_keymaster = 0;
362 while (tries < 15 && !the_keymaster)
363 {
364 i = rndm (RP->Xsize - 2) + 1;
365 j = rndm (RP->Ysize - 2) + 1;
366 tries++;
367 the_keymaster = find_closest_monster (map, i, j, RP);
368 }
369
370 /* if we don't find a good keymaster, drop the key on the ground. */
371 if (!the_keymaster)
372 {
373 int freeindex;
374
375 freeindex = -1;
376 for (tries = 0; tries < 15 && freeindex == -1; tries++)
377 {
378 kx = rndm (RP->Xsize - 2) + 1;
379 ky = rndm (RP->Ysize - 2) + 1;
380 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
381 }
382
383 // can freeindex ever be < 0?
384 if (freeindex >= 0)
385 {
386 kx += freearr_x [freeindex];
387 ky += freearr_y [freeindex];
388 }
389 }
390 }
391 else
392 { /* NO_PASS_DOORS --we have to work harder. */
393 /* don't try to keyplace if we're sitting on a blocked square and
394 NO_PASS_DOORS is set. */
395 if (n_keys == 1)
396 {
397 if (wall_blocked (map, x, y))
398 return 0;
399
400 the_keymaster = find_monster_in_room (map, x, y, RP);
401 if (!the_keymaster) /* if fail, find a spot to drop the key. */
402 find_spot_in_room (map, x, y, &kx, &ky, RP);
403 }
404 else
405 {
406 int sum = 0; /* count how many keys we actually place */
407
408 /* I'm lazy, so just try to place in all 4 directions. */
409 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
410 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
411 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
412 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
413
414 if (sum < 2) /* we might have made a disconnected map-place more keys. */
415 { /* diagonally this time. */
416 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);
418 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);
420 }
421
422 return 1;
423 }
424 }
425
426 if (!the_keymaster)
427 {
428 the_key->x = kx;
429 the_key->y = ky;
430 insert_ob_in_map (the_key, map, NULL, 0);
431 return 1;
432 }
433
434 insert_ob_in_ob (the_key, the_keymaster->head_ ());
435 return 1;
436}
437
438
439
440/* both find_monster_in_room routines need to have access to this. */ 449/* both find_monster_in_room routines need to have access to this. */
441 450
442object *theMonsterToFind; 451object *theMonsterToFind;
443 452
444/* a recursive routine which will return a monster, eventually,if there is one. 453/* a recursive routine which will return a monster, eventually,if there is one.
… …
476 return theMonsterToFind; 485 return theMonsterToFind;
477 } 486 }
478 } 487 }
479 488
480 /* now search all the 8 squares around recursively for a monster,in random order */ 489 /* now search all the 8 squares around recursively for a monster,in random order */
481 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 490 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
482 { 491 {
483 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 492 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
484 if (theMonsterToFind != NULL) 493 if (theMonsterToFind != NULL)
485 return theMonsterToFind; 494 return theMonsterToFind;
486 } 495 }
496
487 return theMonsterToFind; 497 return theMonsterToFind;
488} 498}
489
490 499
491/* sets up some data structures: the _recursive form does the 500/* sets up some data structures: the _recursive form does the
492 real work. */ 501 real work. */
493
494object * 502object *
495find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 503find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
496{ 504{
497 char **layout2; 505 Layout layout2 (RP);
498 int i, j; 506
507 layout2->clear ();
508
509 /* allocate and copy the layout, converting C to 0. */
510 for (int i = 0; i < layout2->w; i++)
511 for (int j = 0; j < layout2->h; j++)
512 if (wall_blocked (map, i, j))
513 layout2[i][j] = '#';
499 514
500 theMonsterToFind = 0; 515 theMonsterToFind = 0;
501 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
502 /* allocate and copy the layout, converting C to 0. */
503 for (i = 0; i < RP->Xsize; i++)
504 {
505 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
506 for (j = 0; j < RP->Ysize; j++)
507 if (wall_blocked (map, i, j))
508 layout2[i][j] = '#';
509 }
510
511 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP); 516 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
512 517
513 /* deallocate the temp. layout */ 518 layout2.free ();
514 for (i = 0; i < RP->Xsize; i++)
515 free (layout2[i]);
516
517 free (layout2);
518 519
519 return theMonsterToFind; 520 return theMonsterToFind;
520} 521}
521 522
522/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 523/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
… …
547 room_free_spots_x[number_of_free_spots_in_room] = x; 548 room_free_spots_x[number_of_free_spots_in_room] = x;
548 room_free_spots_y[number_of_free_spots_in_room] = y; 549 room_free_spots_y[number_of_free_spots_in_room] = y;
549 number_of_free_spots_in_room++; 550 number_of_free_spots_in_room++;
550 551
551 /* now search all the 8 squares around recursively for free spots,in random order */ 552 /* now search all the 8 squares around recursively for free spots,in random order */
552 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 553 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
553 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 554 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
554 555
555} 556}
556 557
557/* find a random non-blocked spot in this room to drop a key. */ 558/* find a random non-blocked spot in this room to drop a key. */
… …
578 /* setup num_free_spots and room_free_spots */ 579 /* setup num_free_spots and room_free_spots */
579 find_spot_in_room_recursive (layout2, x, y, RP); 580 find_spot_in_room_recursive (layout2, x, y, RP);
580 581
581 if (number_of_free_spots_in_room > 0) 582 if (number_of_free_spots_in_room > 0)
582 { 583 {
583 i = rndm (number_of_free_spots_in_room); 584 i = rmg_rndm (number_of_free_spots_in_room);
584 *kx = room_free_spots_x[i]; 585 *kx = room_free_spots_x[i];
585 *ky = room_free_spots_y[i]; 586 *ky = room_free_spots_y[i];
586 } 587 }
587 588
588 /* deallocate the temp. layout */ 589 /* deallocate the temp. layout */
… …
656 *cy = ly; 657 *cy = ly;
657 return; 658 return;
658 } 659 }
659 } 660 }
660 /* give up and return the closest free spot. */ 661 /* give up and return the closest free spot. */
661 i = find_free_spot (archetype::find ("chest"), map, x, y, 1, SIZEOFFREE1 + 1); 662 i = find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
662 663
663 if (i != -1) 664 if (i != -1)
664 { 665 {
665 *cx = x + freearr_x[i]; 666 *cx = x + freearr_x[i];
666 *cy = y + freearr_y[i]; 667 *cy = y + freearr_y[i];
… …
783 else 784 else
784 { 785 {
785 layout[x][y] = 1; 786 layout[x][y] = 1;
786 787
787 /* now search all the 8 squares around recursively for free spots,in random order */ 788 /* now search all the 8 squares around recursively for free spots,in random order */
788 for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++) 789 for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
789 find_doors_in_room_recursive (layout, map, 790 find_doors_in_room_recursive (layout, map,
790 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], 791 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
791 doorlist, ndoors, RP); 792 doorlist, ndoors, RP);
792 } 793 }
793} 794}
… …
797find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 798find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
798{ 799{
799 int i, j; 800 int i, j;
800 int ndoors = 0; 801 int ndoors = 0;
801 802
802 object **doorlist = (object **) calloc (sizeof (int), 1024); 803 object **doorlist = (object **)calloc (sizeof (int), 1024);
803 804
804 MazeData layout2 (RP->Xsize, RP->Ysize); 805 LayoutData layout2 (RP->Xsize, RP->Ysize);
806 layout2.clear ();
805 807
806 /* allocate and copy the layout, converting C to 0. */ 808 /* allocate and copy the layout, converting C to 0. */
807 for (i = 0; i < RP->Xsize; i++) 809 for (i = 0; i < RP->Xsize; i++)
808 for (j = 0; j < RP->Ysize; j++) 810 for (j = 0; j < RP->Ysize; j++)
809 if (wall_blocked (map, i, j)) 811 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
810 layout2[i][j] = '#';
811 812
812 /* setup num_free_spots and room_free_spots */ 813 /* setup num_free_spots and room_free_spots */
813 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 814 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
814 815
815 return doorlist; 816 return doorlist;
… …
828 if (opts & DOORED) 829 if (opts & DOORED)
829 { 830 {
830 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 831 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++)
831 { 832 {
832 object *new_door = get_archetype ("locked_door1"); 833 object *new_door = get_archetype ("locked_door1");
833 char keybuf[1024];
834 834
835 door = doorlist[i]; 835 door = doorlist[i];
836 new_door->face = door->face; 836 new_door->face = door->face;
837 new_door->x = door->x; 837 new_door->x = door->x;
838 new_door->y = door->y; 838 new_door->y = door->y;
839 door->remove (); 839 door->remove ();
840 door->destroy (); 840 door->destroy ();
841 doorlist[i] = new_door; 841 doorlist[i] = new_door;
842 insert_ob_in_map (new_door, map, NULL, 0); 842 insert_ob_in_map (new_door, map, NULL, 0);
843 sprintf (keybuf, "%d", rndm (1000000000)); 843 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
844 new_door->slaying = keybuf;
845 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 844 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
846 } 845 }
847 } 846 }
848 847
849 /* change the faces of the doors and surrounding walls to hide them. */ 848 /* change the faces of the doors and surrounding walls to hide them. */
850 if (opts & HIDDEN) 849 if (opts & HIDDEN)
… …
859 { 858 {
860 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 859 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
861 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 860 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
862 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 861 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
863 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 862 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
863
864 door->face = wallface->face; 864 door->face = wallface->face;
865
865 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 866 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
866 wallface->remove (); 867 wallface->remove ();
868
867 wallface->destroy (); 869 wallface->destroy ();
868 } 870 }
869 } 871 }
870 } 872 }
871} 873}

Diff Legend

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