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.30 by root, Sun Jul 1 05:00:19 2007 UTC vs.
Revision 1.39 by root, Thu May 8 11:39:24 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* placing treasure in maps, where appropriate. */ 24/* placing treasure in maps, where appropriate. */
25 25
26#include <global.h> 26#include <global.h>
… …
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
85 if (door_flag == PASS_DOORS)
86 {
87 int tries = 0;
88
89 the_keymaster = 0;
90 while (tries < 15 && !the_keymaster)
91 {
92 i = rmg_rndm (RP->Xsize - 2) + 1;
93 j = rmg_rndm (RP->Ysize - 2) + 1;
94 tries++;
95 the_keymaster = find_closest_monster (map, i, j, RP);
96 }
97
98 /* if we don't find a good keymaster, drop the key on the ground. */
99 if (!the_keymaster)
100 {
101 int freeindex;
102
103 freeindex = -1;
104 for (tries = 0; tries < 15 && freeindex == -1; tries++)
105 {
106 kx = rmg_rndm (RP->Xsize - 2) + 1;
107 ky = rmg_rndm (RP->Ysize - 2) + 1;
108 freeindex = find_free_spot (gen_key (keycode), map, kx, ky, 1, SIZEOFFREE1 + 1);
109 }
110
111 // can freeindex ever be < 0?
112 if (freeindex >= 0)
113 {
114 kx += freearr_x [freeindex];
115 ky += freearr_y [freeindex];
116 }
117 }
118 }
119 else
120 { /* NO_PASS_DOORS --we have to work harder. */
121 /* don't try to keyplace if we're sitting on a blocked square and
122 NO_PASS_DOORS is set. */
123 if (n_keys == 1)
124 {
125 if (wall_blocked (map, x, y))
126 return 0;
127
128 the_keymaster = find_monster_in_room (map, x, y, RP);
129 if (!the_keymaster) /* if fail, find a spot to drop the key. */
130 find_spot_in_room (map, x, y, &kx, &ky, RP);
131 }
132 else
133 {
134 int sum = 0; /* count how many keys we actually place */
135
136 /* I'm lazy, so just try to place in all 4 directions. */
137 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
138 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
139 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
140 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
141
142 if (sum < 2) /* we might have made a disconnected map-place more keys. */
143 { /* diagonally this time. */
144 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
145 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
146 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
147 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
148 }
149
150 return 1;
151 }
152 }
153
154 object *the_key = gen_key (keycode);
155
156 if (the_keymaster)
157 the_keymaster->head_ ()->insert (the_key);
158 else
159 {
160 the_key->x = kx;
161 the_key->y = ky;
162 insert_ob_in_map (the_key, map, NULL, 0);
163 }
164
165 return 1;
51} 166}
52 167
53/* returns true if square x,y has P_NO_PASS set, which is true for walls 168/* returns true if square x,y has P_NO_PASS set, which is true for walls
54 * and doors but not monsters. 169 * and doors but not monsters.
55 * This function is not map tile aware. 170 * This function is not map tile aware.
… …
82 if (treasure_style) 197 if (treasure_style)
83 if (!strcmp (treasure_style, "none")) 198 if (!strcmp (treasure_style, "none"))
84 return; 199 return;
85 200
86 if (treasureoptions <= 0) 201 if (treasureoptions <= 0)
87 treasureoptions = rndm (2 * LAST_OPTION); 202 treasureoptions = rmg_rndm (2 * LAST_OPTION);
88 203
89 /* filter out the mutually exclusive options */ 204 /* filter out the mutually exclusive options */
90 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 205 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
91 { 206 {
92 if (rndm (2)) 207 if (rmg_rndm (2))
93 treasureoptions -= 1; 208 treasureoptions -= 1;
94 else 209 else
95 treasureoptions -= 2; 210 treasureoptions -= 2;
96 } 211 }
97 212
… …
118 } 233 }
119 234
120 /* all the treasure at one spot in the map. */ 235 /* all the treasure at one spot in the map. */
121 if (treasureoptions & CONCENTRATED) 236 if (treasureoptions & CONCENTRATED)
122 { 237 {
123
124 /* map_layout_style global, and is previously set */ 238 /* map_layout_style global, and is previously set */
125 switch (RP->map_layout_style) 239 switch (RP->map_layout_style)
126 { 240 {
127 case LAYOUT_ONION: 241 case LAYOUT_ONION:
128 case LAYOUT_SPIRAL: 242 case LAYOUT_SPIRAL:
… …
136 for (j = 0; j < RP->Ysize; j++) 250 for (j = 0; j < RP->Ysize; j++)
137 { 251 {
138 if (layout[i][j] == 'C' || layout[i][j] == '>') 252 if (layout[i][j] == 'C' || layout[i][j] == '>')
139 { 253 {
140 int tdiv = RP->symmetry_used; 254 int tdiv = RP->symmetry_used;
141 object **doorlist;
142 object *chest; 255 object *chest;
143 256
144 if (tdiv == 3) 257 if (tdiv == 3)
145 tdiv = 2; /* this symmetry uses a divisor of 2 */ 258 tdiv = 2; /* this symmetry uses a divisor of 2 */
259
146 /* don't put a chest on an exit. */ 260 /* don't put a chest on an exit. */
147 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP); 261 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP);
262
148 if (!chest) 263 if (!chest)
149 continue; /* if no chest was placed NEXT */ 264 continue; /* if no chest was placed NEXT */
265
150 if (treasureoptions & (DOORED | HIDDEN)) 266 if (treasureoptions & (DOORED | HIDDEN))
151 { 267 {
152 doorlist = find_doors_in_room (map, i, j, RP); 268 object **doorlist = find_doors_in_room (map, i, j, RP);
153 lock_and_hide_doors (doorlist, map, treasureoptions, RP); 269 lock_and_hide_doors (doorlist, map, treasureoptions, RP);
154 free (doorlist); 270 free (doorlist);
155 } 271 }
156 } 272 }
157 } 273 }
158 } 274 }
159 break; 275 break;
160 } 276 }
277
161 default: 278 default:
162 { 279 {
163 int i, j, tries; 280 int i, j, tries;
164 object *chest; 281 object *chest;
165 object **doorlist; 282 object **doorlist;
166 283
167 i = j = -1; 284 i = j = -1;
168 tries = 0; 285 tries = 0;
169 while (i == -1 && tries < 100) 286 while (i == -1 && tries < 100)
170 { 287 {
171 i = rndm (RP->Xsize - 2) + 1; 288 i = rmg_rndm (RP->Xsize - 2) + 1;
172 j = rndm (RP->Ysize - 2) + 1; 289 j = rmg_rndm (RP->Ysize - 2) + 1;
173 find_enclosed_spot (map, &i, &j, RP); 290 find_enclosed_spot (map, &i, &j, RP);
291
174 if (wall_blocked (map, i, j)) 292 if (wall_blocked (map, i, j))
175 i = -1; 293 i = -1;
294
176 tries++; 295 tries++;
177 } 296 }
297
178 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP); 298 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP);
299
179 if (!chest) 300 if (!chest)
180 return; 301 return;
302
181 i = chest->x; 303 i = chest->x;
182 j = chest->y; 304 j = chest->y;
183 if (treasureoptions & (DOORED | HIDDEN)) 305 if (treasureoptions & (DOORED | HIDDEN))
184 { 306 {
185 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 307 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
193 { /* DIFFUSE treasure layout */ 315 { /* DIFFUSE treasure layout */
194 int ti, i, j; 316 int ti, i, j;
195 317
196 for (ti = 0; ti < num_treasures; ti++) 318 for (ti = 0; ti < num_treasures; ti++)
197 { 319 {
198 i = rndm (RP->Xsize - 2) + 1; 320 i = rmg_rndm (RP->Xsize - 2) + 1;
199 j = rndm (RP->Ysize - 2) + 1; 321 j = rmg_rndm (RP->Ysize - 2) + 1;
200 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 322 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
201 } 323 }
202 } 324 }
203} 325}
204 326
205/* put a chest into the map, near x and y, with the treasure style 327/* put a chest into the map, near x and y, with the treasure style
206 determined (may be null, or may be a treasure list from lib/treasures, 328 determined (may be null, or may be a treasure list from lib/treasures,
207 if the global variable "treasurestyle" is set to that treasure list's name */ 329 if the global variable "treasurestyle" is set to that treasure list's name */
208
209object * 330object *
210place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP) 331place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP)
211{ 332{
212 object *the_chest;
213 int i, xl, yl;
214
215 the_chest = get_archetype ("chest"); /* was "chest_2" */ 333 object *the_chest = archetype::get (shstr_chest); /* was "chest_2" */
216 334
217 /* first, find a place to put the chest. */ 335 /* first, find a place to put the chest. */
218 i = find_first_free_spot (the_chest, map, x, y); 336 int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng
219 if (i == -1) 337 if (i == -1)
220 { 338 {
221 the_chest->destroy (); 339 the_chest->destroy ();
222 return NULL; 340 return NULL;
223 } 341 }
224 342
225 xl = x + freearr_x[i]; 343 int xl = x + freearr_x[i];
226 yl = y + freearr_y[i]; 344 int yl = y + freearr_y[i];
227 345
228 /* if the placement is blocked, return a fail. */ 346 /* if the placement is blocked, return a fail. */
229 if (wall_blocked (map, xl, yl)) 347 if (wall_blocked (map, xl, yl))
230 return 0; 348 return 0;
231 349
… …
238 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 356 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
239 357
240 if (tlist != NULL) 358 if (tlist != NULL)
241 for (ti = 0; ti < n_treasures; ti++) 359 for (ti = 0; ti < n_treasures; ti++)
242 { /* use the treasure list */ 360 { /* use the treasure list */
243 object *new_treasure = style_map->pick_random_object (); 361 object *new_treasure = style_map->pick_random_object (rmg_rndm);
244 362
245 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 363 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
246 } 364 }
247 else 365 else
248 { /* use the style map */ 366 { /* use the style map */
… …
259 377
260 /* stick a trap in the chest if required */ 378 /* stick a trap in the chest if required */
261 if (treasureoptions & TRAPPED) 379 if (treasureoptions & TRAPPED)
262 { 380 {
263 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 381 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
264 object *the_trap;
265 382
266 if (trap_map) 383 if (trap_map)
267 { 384 {
268 the_trap = trap_map->pick_random_object (); 385 object *the_trap = trap_map->pick_random_object (rmg_rndm);
386
269 the_trap->stats.Cha = 10 + RP->difficulty; 387 the_trap->stats.Cha = 10 + RP->difficulty;
270 the_trap->level = bc_random ((3 * RP->difficulty) / 2); 388 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
389
271 if (the_trap) 390 if (the_trap)
272 { 391 {
273 object *new_trap; 392 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
274 393
275 new_trap = arch_to_object (the_trap->arch);
276 new_trap->copy_to (the_trap);
277 new_trap->x = x; 394 new_trap->x = x;
278 new_trap->y = y; 395 new_trap->y = y;
279 insert_ob_in_ob (new_trap, the_chest); 396 insert_ob_in_ob (new_trap, the_chest);
280 } 397 }
281 } 398 }
… …
284 /* set the chest lock code, and call the keyplacer routine with 401 /* set the chest lock code, and call the keyplacer routine with
285 the lockcode. It's not worth bothering to lock the chest if 402 the lockcode. It's not worth bothering to lock the chest if
286 there's only 1 treasure.... */ 403 there's only 1 treasure.... */
287 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 404 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
288 { 405 {
289 char keybuf[1024]; 406 the_chest->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
290
291 sprintf (keybuf, "%d", rndm (1000000000));
292 the_chest->slaying = keybuf;
293 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 407 keyplace (map, x, y, the_chest->slaying, PASS_DOORS, 1, RP);
294 } 408 }
295 409
296 /* actually place the chest. */ 410 /* actually place the chest. */
297 the_chest->x = xl; 411 the_chest->x = xl;
298 the_chest->y = yl; 412 the_chest->y = yl;
… …
327 } 441 }
328 } 442 }
329 return NULL; 443 return NULL;
330} 444}
331 445
332
333
334/* places keys in the map, preferably in something alive.
335 keycode is the key's code,
336 door_flag is either PASS_DOORS or NO_PASS_DOORS.
337 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
338 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
339 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
340
341 The idea is that you call keyplace on x,y where a door is, and it'll make
342 sure a key is placed on both sides of the door.
343*/
344int
345keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
346{
347 int i, j;
348 int kx = 0, ky = 0;
349 object *the_keymaster; /* the monster that gets the key. */
350 object *the_key;
351
352 /* get a key and set its keycode */
353 the_key = get_archetype ("key2");
354 the_key->slaying = keycode;
355
356 if (door_flag == PASS_DOORS)
357 {
358 int tries = 0;
359
360 the_keymaster = 0;
361 while (tries < 15 && !the_keymaster)
362 {
363 i = rndm (RP->Xsize - 2) + 1;
364 j = rndm (RP->Ysize - 2) + 1;
365 tries++;
366 the_keymaster = find_closest_monster (map, i, j, RP);
367 }
368
369 /* if we don't find a good keymaster, drop the key on the ground. */
370 if (!the_keymaster)
371 {
372 int freeindex;
373
374 freeindex = -1;
375 for (tries = 0; tries < 15 && freeindex == -1; tries++)
376 {
377 kx = rndm (RP->Xsize - 2) + 1;
378 ky = rndm (RP->Ysize - 2) + 1;
379 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
380 }
381
382 // can freeindex ever be < 0?
383 if (freeindex >= 0)
384 {
385 kx += freearr_x [freeindex];
386 ky += freearr_y [freeindex];
387 }
388 }
389 }
390 else
391 { /* NO_PASS_DOORS --we have to work harder. */
392 /* don't try to keyplace if we're sitting on a blocked square and
393 NO_PASS_DOORS is set. */
394 if (n_keys == 1)
395 {
396 if (wall_blocked (map, x, y))
397 return 0;
398
399 the_keymaster = find_monster_in_room (map, x, y, RP);
400 if (!the_keymaster) /* if fail, find a spot to drop the key. */
401 find_spot_in_room (map, x, y, &kx, &ky, RP);
402 }
403 else
404 {
405 int sum = 0; /* count how many keys we actually place */
406
407 /* I'm lazy, so just try to place in all 4 directions. */
408 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
409 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
410 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
411 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
412
413 if (sum < 2) /* we might have made a disconnected map-place more keys. */
414 { /* diagonally this time. */
415 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);
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 }
420
421 return 1;
422 }
423 }
424
425 if (!the_keymaster)
426 {
427 the_key->x = kx;
428 the_key->y = ky;
429 insert_ob_in_map (the_key, map, NULL, 0);
430 return 1;
431 }
432
433 insert_ob_in_ob (the_key, the_keymaster);
434 return 1;
435}
436
437
438
439/* both find_monster_in_room routines need to have access to this. */ 446/* both find_monster_in_room routines need to have access to this. */
440 447
441object *theMonsterToFind; 448object *theMonsterToFind;
442 449
443/* a recursive routine which will return a monster, eventually,if there is one. 450/* a recursive routine which will return a monster, eventually,if there is one.
… …
475 return theMonsterToFind; 482 return theMonsterToFind;
476 } 483 }
477 } 484 }
478 485
479 /* now search all the 8 squares around recursively for a monster,in random order */ 486 /* now search all the 8 squares around recursively for a monster,in random order */
480 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 487 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
481 { 488 {
482 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 489 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
483 if (theMonsterToFind != NULL) 490 if (theMonsterToFind != NULL)
484 return theMonsterToFind; 491 return theMonsterToFind;
485 } 492 }
493
486 return theMonsterToFind; 494 return theMonsterToFind;
487} 495}
488
489 496
490/* sets up some data structures: the _recursive form does the 497/* sets up some data structures: the _recursive form does the
491 real work. */ 498 real work. */
492
493object * 499object *
494find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 500find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
495{ 501{
496 char **layout2; 502 Layout layout2 (RP);
497 int i, j; 503
504 layout2->clear ();
505
506 /* allocate and copy the layout, converting C to 0. */
507 for (int i = 0; i < layout2->w; i++)
508 for (int j = 0; j < layout2->h; j++)
509 if (wall_blocked (map, i, j))
510 layout2[i][j] = '#';
498 511
499 theMonsterToFind = 0; 512 theMonsterToFind = 0;
500 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
501 /* allocate and copy the layout, converting C to 0. */
502 for (i = 0; i < RP->Xsize; i++)
503 {
504 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
505 for (j = 0; j < RP->Ysize; j++)
506 {
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); 513 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
512 514
513 /* deallocate the temp. layout */ 515 layout2.free ();
514 for (i = 0; i < RP->Xsize; i++)
515 {
516 free (layout2[i]);
517 }
518 free (layout2);
519 516
520 return theMonsterToFind; 517 return theMonsterToFind;
521} 518}
522 519
523/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 520/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
… …
548 room_free_spots_x[number_of_free_spots_in_room] = x; 545 room_free_spots_x[number_of_free_spots_in_room] = x;
549 room_free_spots_y[number_of_free_spots_in_room] = y; 546 room_free_spots_y[number_of_free_spots_in_room] = y;
550 number_of_free_spots_in_room++; 547 number_of_free_spots_in_room++;
551 548
552 /* now search all the 8 squares around recursively for free spots,in random order */ 549 /* now search all the 8 squares around recursively for free spots,in random order */
553 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 550 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
554 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 551 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
555 552
556} 553}
557 554
558/* find a random non-blocked spot in this room to drop a key. */ 555/* find a random non-blocked spot in this room to drop a key. */
… …
579 /* setup num_free_spots and room_free_spots */ 576 /* setup num_free_spots and room_free_spots */
580 find_spot_in_room_recursive (layout2, x, y, RP); 577 find_spot_in_room_recursive (layout2, x, y, RP);
581 578
582 if (number_of_free_spots_in_room > 0) 579 if (number_of_free_spots_in_room > 0)
583 { 580 {
584 i = rndm (number_of_free_spots_in_room); 581 i = rmg_rndm (number_of_free_spots_in_room);
585 *kx = room_free_spots_x[i]; 582 *kx = room_free_spots_x[i];
586 *ky = room_free_spots_y[i]; 583 *ky = room_free_spots_y[i];
587 } 584 }
588 585
589 /* deallocate the temp. layout */ 586 /* deallocate the temp. layout */
… …
657 *cy = ly; 654 *cy = ly;
658 return; 655 return;
659 } 656 }
660 } 657 }
661 /* give up and return the closest free spot. */ 658 /* give up and return the closest free spot. */
662 i = find_free_spot (archetype::find ("chest"), map, x, y, 1, SIZEOFFREE1 + 1); 659 i = find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
663 660
664 if (i != -1) 661 if (i != -1)
665 { 662 {
666 *cx = x + freearr_x[i]; 663 *cx = x + freearr_x[i];
667 *cy = y + freearr_y[i]; 664 *cy = y + freearr_y[i];
… …
746 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 743 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
747 return tmp; 744 return tmp;
748 return NULL; 745 return NULL;
749} 746}
750 747
751
752/* the workhorse routine, which finds the doors in a room */ 748/* the workhorse routine, which finds the doors in a room */
753void 749void
754find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP) 750find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP)
755{ 751{
756 int i, j; 752 int i, j;
… …
770 layout[x][y] = 1; 766 layout[x][y] = 1;
771 door = door_in_square (map, x, y); 767 door = door_in_square (map, x, y);
772 if (door) 768 if (door)
773 { 769 {
774 doorlist[*ndoors] = door; 770 doorlist[*ndoors] = door;
771
775 if (*ndoors > 1022) /* eek! out of memory */ 772 if (*ndoors > 1022) /* eek! out of memory */
776 { 773 {
777 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n"); 774 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n");
778 return; 775 return;
779 } 776 }
… …
784 else 781 else
785 { 782 {
786 layout[x][y] = 1; 783 layout[x][y] = 1;
787 784
788 /* now search all the 8 squares around recursively for free spots,in random order */ 785 /* now search all the 8 squares around recursively for free spots,in random order */
789 for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++) 786 for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
790 find_doors_in_room_recursive (layout, map, 787 find_doors_in_room_recursive (layout, map,
791 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], 788 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
792 doorlist, ndoors, RP); 789 doorlist, ndoors, RP);
793 } 790 }
794} 791}
795 792
796/* find a random non-blocked spot in this room to drop a key. */ 793/* find a random non-blocked spot in this room to drop a key. */
797object ** 794object **
798find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 795find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
799{ 796{
800 char **layout2;
801 object **doorlist;
802 int i, j; 797 int i, j;
803 int ndoors = 0; 798 int ndoors = 0;
804 799
805 doorlist = (object **) calloc (sizeof (int), 1024); 800 object **doorlist = (object **)calloc (sizeof (int), 1024);
806 801
807 layout2 = (char **) calloc (sizeof (char *), RP->Xsize); 802 LayoutData layout2 (RP->Xsize, RP->Ysize);
803 layout2.clear ();
804
808 /* allocate and copy the layout, converting C to 0. */ 805 /* allocate and copy the layout, converting C to 0. */
809 for (i = 0; i < RP->Xsize; i++) 806 for (i = 0; i < RP->Xsize; i++)
810 {
811 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
812 for (j = 0; j < RP->Ysize; j++) 807 for (j = 0; j < RP->Ysize; j++)
813 { 808 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
814 if (wall_blocked (map, i, j))
815 layout2[i][j] = '#';
816 }
817 }
818 809
819 /* setup num_free_spots and room_free_spots */ 810 /* setup num_free_spots and room_free_spots */
820 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 811 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
821 812
822 /* deallocate the temp. layout */
823 for (i = 0; i < RP->Xsize; i++)
824 free (layout2[i]);
825
826 free (layout2);
827 return doorlist; 813 return doorlist;
828} 814}
829
830
831 815
832/* locks and/or hides all the doors in doorlist, or does nothing if 816/* locks and/or hides all the doors in doorlist, or does nothing if
833 opts doesn't say to lock/hide doors. */ 817 opts doesn't say to lock/hide doors. */
834
835void 818void
836lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP) 819lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP)
837{ 820{
838 object *door; 821 object *door;
839 int i; 822 int i;
… …
843 if (opts & DOORED) 826 if (opts & DOORED)
844 { 827 {
845 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 828 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++)
846 { 829 {
847 object *new_door = get_archetype ("locked_door1"); 830 object *new_door = get_archetype ("locked_door1");
848 char keybuf[1024];
849 831
850 door = doorlist[i]; 832 door = doorlist[i];
851 new_door->face = door->face; 833 new_door->face = door->face;
852 new_door->x = door->x; 834 new_door->x = door->x;
853 new_door->y = door->y; 835 new_door->y = door->y;
854 door->remove (); 836 door->remove ();
855 door->destroy (); 837 door->destroy ();
856 doorlist[i] = new_door; 838 doorlist[i] = new_door;
857 insert_ob_in_map (new_door, map, NULL, 0); 839 insert_ob_in_map (new_door, map, NULL, 0);
858 sprintf (keybuf, "%d", rndm (1000000000)); 840 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
859 new_door->slaying = keybuf;
860 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 841 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
861 } 842 }
862 } 843 }
863 844
864 /* change the faces of the doors and surrounding walls to hide them. */ 845 /* change the faces of the doors and surrounding walls to hide them. */
865 if (opts & HIDDEN) 846 if (opts & HIDDEN)
… …
874 { 855 {
875 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 856 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
876 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 857 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
877 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 858 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
878 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 859 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
860
879 door->face = wallface->face; 861 door->face = wallface->face;
862
880 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 863 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
881 wallface->remove (); 864 wallface->remove ();
865
882 wallface->destroy (); 866 wallface->destroy ();
883 } 867 }
884 } 868 }
885 } 869 }
886} 870}

Diff Legend

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